Add tempo track

CrSjimo · CrSjimo · commit e450d613e83f · 2025-12-23T03:21:23.000+08:00
diff --git a/.github/actions/initialize-build-environment/action.yml b/.github/actions/initialize-build-environment/action.yml
@@ -45,5 +45,5 @@ runs:
       uses: jurplel/install-qt-action@v4
       with:
         version: ${{ inputs.qt_version }}
-        modules: qt5compat qtshadertools
+        modules: qt5compat qtscxml qtshadertools
         cache: true
diff --git a/src/libs/3rdparty/scopicflow b/src/libs/3rdparty/scopicflow
@@ -1 +1 @@
-Subproject commit ca6e98cbbe30890493cbb6d55113ab99f24f2b53
+Subproject commit fbaf8e7fdbf0a644c39ef62bf51fc48e95d42cd5
diff --git a/src/libs/application/dspxmodel/src/selectionmodel/SelectionModel.cpp b/src/libs/application/dspxmodel/src/selectionmodel/SelectionModel.cpp
@@ -158,9 +158,12 @@ namespace dspx {
         return ST_None;
     }
 
-    void SelectionModel::select(QObject *item, SelectionCommand command) {
+    void SelectionModel::select(QObject *item, SelectionCommand command, SelectionType emptySelectionType) {
         Q_D(SelectionModel);
         auto targetSelectionType = selectionTypeFromItem(item);
+        if (targetSelectionType == ST_None) {
+            targetSelectionType = emptySelectionType;
+        }
         if (targetSelectionType != d->selectionType) {
             switch (d->selectionType) {
                 case ST_AnchorNode:
diff --git a/src/libs/application/dspxmodel/src/selectionmodel/SelectionModel.h b/src/libs/application/dspxmodel/src/selectionmodel/SelectionModel.h
@@ -76,7 +76,7 @@ namespace dspx {
         Q_DECLARE_FLAGS(SelectionCommand, SelectionCommandFlag)
 
         Q_INVOKABLE static SelectionType selectionTypeFromItem(QObject *item);
-        Q_INVOKABLE void select(QObject *item, SelectionCommand command);
+        Q_INVOKABLE void select(QObject *item, SelectionCommand command, SelectionType emptySelectionType = {});
 
     Q_SIGNALS:
         void selectionTypeChanged();
diff --git a/src/plugins/coreplugin/project/DspxDocument.cpp b/src/plugins/coreplugin/project/DspxDocument.cpp
@@ -4,6 +4,7 @@
 #include <QUndoStack>
 
 #include <dspxmodel/Model.h>
+#include <dspxmodel/SelectionModel.h>
 #include <dspxmodel/UndoableModelStrategy.h>
 
 #include <transactional/TransactionController.h>
@@ -42,6 +43,7 @@ namespace Core {
         auto modelStrategy = new dspx::UndoableModelStrategy; // TODO use substate in future
         d->model = new dspx::Model(modelStrategy, this);
         modelStrategy->setParent(d->model);
+        d->selectionModel = new dspx::SelectionModel(d->model, this);
         auto transactionalStrategy = new TransactionalModelStrategy(modelStrategy);
         d->transactionController = new TransactionController(transactionalStrategy, this);
         transactionalStrategy->setParent(d->transactionController);
@@ -54,6 +56,11 @@ namespace Core {
         return d->model;
     }
 
+    dspx::SelectionModel *DspxDocument::selectionModel() const {
+        Q_D(const DspxDocument);
+        return d->selectionModel;
+    }
+
     TransactionController *DspxDocument::transactionController() const {
         Q_D(const DspxDocument);
         return d->transactionController;
diff --git a/src/plugins/coreplugin/project/DspxDocument.h b/src/plugins/coreplugin/project/DspxDocument.h
@@ -8,6 +8,7 @@
 
 namespace dspx {
     class Model;
+    class SelectionModel;
 }
 
 namespace Core {
@@ -21,12 +22,14 @@ namespace Core {
         QML_ELEMENT
         Q_DECLARE_PRIVATE(DspxDocument)
         Q_PROPERTY(dspx::Model *model READ model CONSTANT)
+        Q_PROPERTY(dspx::SelectionModel *selectionModel READ selectionModel CONSTANT)
         Q_PROPERTY(TransactionController *transactionController READ transactionController CONSTANT)
     public:
         explicit DspxDocument(QObject *parent = nullptr);
         ~DspxDocument() override;
 
         dspx::Model *model() const;
+        dspx::SelectionModel *selectionModel() const;
         TransactionController *transactionController() const;
 
     private:
diff --git a/src/plugins/coreplugin/project/DspxDocument_p.h b/src/plugins/coreplugin/project/DspxDocument_p.h
@@ -9,6 +9,7 @@ namespace Core {
     public:
         DspxDocument *q_ptr;
         dspx::Model *model;
+        dspx::SelectionModel *selectionModel;
         TransactionController *transactionController;
     };
 }
diff --git a/src/plugins/visualeditor/CMakeLists.txt b/src/plugins/visualeditor/CMakeLists.txt
@@ -17,6 +17,7 @@ diffscope_add_builtin_plugin(${PROJECT_NAME}
         QuickControls2
         QuickTemplates2
         QuickDialogs2
+        StateMachine
     QT_INCLUDE_PRIVATE
         Core
         Gui
diff --git a/src/plugins/visualeditor/core/ArrangementPanelInterface.cpp b/src/plugins/visualeditor/core/ArrangementPanelInterface.cpp
@@ -12,6 +12,7 @@
 #include <ScopicFlowCore/TimeLayoutViewModel.h>
 #include <ScopicFlowCore/TimeViewModel.h>
 #include <ScopicFlowCore/TimelineInteractionController.h>
+#include <ScopicFlowCore/LabelSequenceInteractionController.h>
 
 #include <coreplugin/ProjectWindowInterface.h>
 #include <coreplugin/ProjectTimeline.h>
@@ -118,6 +119,7 @@ namespace VisualEditor {
         d->timeLayoutViewModel = new sflow::TimeLayoutViewModel(this);
         d->timelineInteractionController = new sflow::TimelineInteractionController(this);
         d->scrollBehaviorViewModel = new sflow::ScrollBehaviorViewModel(this);
+        d->labelSequenceInteractionControllerOfTempo = ProjectViewModelContext::of(d->windowHandle)->createAndBindLabelSequenceInteractionControllerOfTempo();
 
         d->positionAlignmentManipulator = new PositionAlignmentManipulator(this);
         d->positionAlignmentManipulator->setTimeLayoutViewModel(d->timeLayoutViewModel);
@@ -179,6 +181,10 @@ namespace VisualEditor {
         Q_D(const ArrangementPanelInterface);
         return d->timelineInteractionController;
     }
+    sflow::LabelSequenceInteractionController *ArrangementPanelInterface::labelSequenceInteractionControllerOfTempo() const {
+        Q_D(const ArrangementPanelInterface);
+        return d->labelSequenceInteractionControllerOfTempo;
+    }
 
     PositionAlignmentManipulator *ArrangementPanelInterface::positionAlignmentManipulator() const {
         Q_D(const ArrangementPanelInterface);
diff --git a/src/plugins/visualeditor/core/ArrangementPanelInterface.h b/src/plugins/visualeditor/core/ArrangementPanelInterface.h
@@ -13,6 +13,7 @@ namespace sflow {
     class TimeLayoutViewModel;
     class TimelineInteractionController;
     class ScrollBehaviorViewModel;
+    class LabelSequenceInteractionController;
 }
 
 namespace Core {
@@ -40,6 +41,7 @@ namespace VisualEditor {
         Q_PROPERTY(sflow::TimeLayoutViewModel *timeLayoutViewModel READ timeLayoutViewModel CONSTANT)
         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(PositionAlignmentManipulator *positionAlignmentManipulator READ positionAlignmentManipulator CONSTANT)
         Q_PROPERTY(AutoPageScrollingManipulator *autoPageScrollingManipulator READ autoPageScrollingManipulator CONSTANT)
         Q_PROPERTY(QQuickItem *arrangementView READ arrangementView CONSTANT)
@@ -57,6 +59,7 @@ namespace VisualEditor {
         sflow::TimeLayoutViewModel *timeLayoutViewModel() const;
         sflow::ScrollBehaviorViewModel *scrollBehaviorViewModel() const;
         sflow::TimelineInteractionController *timelineInteractionController() const;
+        sflow::LabelSequenceInteractionController *labelSequenceInteractionControllerOfTempo() const;
 
         PositionAlignmentManipulator *positionAlignmentManipulator() const;
         AutoPageScrollingManipulator *autoPageScrollingManipulator() const;
diff --git a/src/plugins/visualeditor/core/ArrangementPanelInterface_p.h b/src/plugins/visualeditor/core/ArrangementPanelInterface_p.h
@@ -19,6 +19,7 @@ namespace VisualEditor {
         sflow::TimeLayoutViewModel *timeLayoutViewModel;
         sflow::TimelineInteractionController *timelineInteractionController;
         sflow::ScrollBehaviorViewModel *scrollBehaviorViewModel;
+        sflow::LabelSequenceInteractionController *labelSequenceInteractionControllerOfTempo;
 
         PositionAlignmentManipulator *positionAlignmentManipulator;
         AutoPageScrollingManipulator *autoPageScrollingManipulator;
diff --git a/src/plugins/visualeditor/core/PlaybackViewModelContextData.cpp b/src/plugins/visualeditor/core/PlaybackViewModelContextData.cpp
@@ -0,0 +1,52 @@
+#include "PlaybackViewModelContextData_p.h"
+
+#include <QLoggingCategory>
+
+#include <ScopicFlowCore/PlaybackViewModel.h>
+
+#include <coreplugin/ProjectTimeline.h>
+#include <coreplugin/ProjectWindowInterface.h>
+
+#include <visualeditor/ProjectViewModelContext.h>
+
+namespace VisualEditor {
+
+    Q_STATIC_LOGGING_CATEGORY(lcPlaybackViewModelContextData, "diffscope.visualeditor.playbackviewmodelcontextdata")
+
+    void PlaybackViewModelContextData::init() {
+        Q_Q(ProjectViewModelContext);
+        windowHandle = q->windowHandle();
+        playbackViewModel = new sflow::PlaybackViewModel(q);
+    }
+
+    void PlaybackViewModelContextData::bindPlaybackViewModel() {
+        auto projectTimeline = windowHandle->projectTimeline();
+        QObject::connect(projectTimeline, &Core::ProjectTimeline::positionChanged, playbackViewModel, [=] {
+            if (playbackViewModel->primaryPosition() == projectTimeline->position())
+                return;
+            qCDebug(lcPlaybackViewModelContextData) << "Project timeline position updated" << projectTimeline->position();
+            playbackViewModel->setPrimaryPosition(projectTimeline->position());
+        });
+        QObject::connect(projectTimeline, &Core::ProjectTimeline::lastPositionChanged, playbackViewModel, [=] {
+            if (playbackViewModel->secondaryPosition() == projectTimeline->lastPosition())
+                return;
+            qCDebug(lcPlaybackViewModelContextData) << "Project timeline last position updated" << projectTimeline->lastPosition();
+            playbackViewModel->setSecondaryPosition(projectTimeline->lastPosition());
+        });
+        QObject::connect(playbackViewModel, &sflow::PlaybackViewModel::primaryPositionChanged, projectTimeline, [=] {
+            if (projectTimeline->position() == playbackViewModel->primaryPosition())
+                return;
+            qCDebug(lcPlaybackViewModelContextData) << "Playback view model primary position updated" << playbackViewModel->primaryPosition();
+            projectTimeline->setPosition(playbackViewModel->primaryPosition());
+        });
+        QObject::connect(playbackViewModel, &sflow::PlaybackViewModel::secondaryPositionChanged, projectTimeline, [=] {
+            if (projectTimeline->lastPosition() == playbackViewModel->secondaryPosition())
+                return;
+            qCDebug(lcPlaybackViewModelContextData) << "Playback view model secondary position updated" << playbackViewModel->secondaryPosition();
+            projectTimeline->setLastPosition(playbackViewModel->secondaryPosition());
+        });
+        playbackViewModel->setPrimaryPosition(projectTimeline->position());
+        playbackViewModel->setSecondaryPosition(projectTimeline->lastPosition());
+    }
+
+}
diff --git a/src/plugins/visualeditor/core/PlaybackViewModelContextData_p.h b/src/plugins/visualeditor/core/PlaybackViewModelContextData_p.h
@@ -0,0 +1,22 @@
+#ifndef DIFFSCOPE_VISUALEDITOR_PLAYBACKVIEWMODELCONTEXTDATA_P_H
+#define DIFFSCOPE_VISUALEDITOR_PLAYBACKVIEWMODELCONTEXTDATA_P_H
+
+#include <visualeditor/ProjectViewModelContext.h>
+
+namespace VisualEditor {
+
+    class PlaybackViewModelContextData {
+        Q_DECLARE_PUBLIC(ProjectViewModelContext)
+    public:
+        ProjectViewModelContext *q_ptr;
+
+        Core::ProjectWindowInterface *windowHandle;
+        sflow::PlaybackViewModel *playbackViewModel;
+
+        void init();
+        void bindPlaybackViewModel();
+    };
+
+}
+
+#endif //DIFFSCOPE_VISUALEDITOR_PLAYBACKVIEWMODELCONTEXTDATA_P_H
diff --git a/src/plugins/visualeditor/core/ProjectViewModelContext.cpp b/src/plugins/visualeditor/core/ProjectViewModelContext.cpp
@@ -1,42 +1,39 @@
 #include "ProjectViewModelContext.h"
 #include "ProjectViewModelContext_p.h"
-
-#include <QBindable>
+#include "PlaybackViewModelContextData_p.h"
+#include "TempoViewModelContextData_p.h"
 
 #include <ScopicFlowCore/PlaybackViewModel.h>
+#include <ScopicFlowCore/PointSequenceViewModel.h>
+#include <ScopicFlowCore/LabelViewModel.h>
+#include <ScopicFlowCore/LabelSequenceInteractionController.h>
+#include <ScopicFlowCore/SelectionController.h>
+
+#include <dspxmodel/Tempo.h>
 
 #include <coreplugin/ProjectTimeline.h>
 #include <coreplugin/ProjectWindowInterface.h>
 
-namespace VisualEditor {
+#include <memory>
 
-    void ProjectViewModelContextPrivate::bindPlaybackViewModel() const {
-        auto projectTimeline = windowHandle->projectTimeline();
-        QObject::connect(projectTimeline, &Core::ProjectTimeline::positionChanged, playbackViewModel, [=] {
-            playbackViewModel->setPrimaryPosition(projectTimeline->position());
-        });
-        QObject::connect(projectTimeline, &Core::ProjectTimeline::lastPositionChanged, playbackViewModel, [=] {
-            playbackViewModel->setSecondaryPosition(projectTimeline->lastPosition());
-        });
-        QObject::connect(playbackViewModel, &sflow::PlaybackViewModel::primaryPositionChanged, projectTimeline, [=] {
-            projectTimeline->setPosition(playbackViewModel->primaryPosition());
-        });
-        QObject::connect(playbackViewModel, &sflow::PlaybackViewModel::secondaryPositionChanged, projectTimeline, [=] {
-            projectTimeline->setLastPosition(playbackViewModel->secondaryPosition());
-        });
-        playbackViewModel->setPrimaryPosition(projectTimeline->position()); 
-        playbackViewModel->setSecondaryPosition(projectTimeline->lastPosition());
-    }
+namespace VisualEditor {
 
     ProjectViewModelContext::ProjectViewModelContext(Core::ProjectWindowInterface *windowHandle) : QObject(windowHandle), d_ptr(new ProjectViewModelContextPrivate) {
         Q_D(ProjectViewModelContext);
         Q_ASSERT(windowHandle->getObjects(staticMetaObject.className()).isEmpty());
         windowHandle->addObject(staticMetaObject.className(), this);
         d->q_ptr = this;
         d->windowHandle = windowHandle;
-        d->playbackViewModel = new sflow::PlaybackViewModel(this);
 
-        d->bindPlaybackViewModel();
+        d->playbackData = std::make_unique<PlaybackViewModelContextData>();
+        d->playbackData->q_ptr = this;
+        d->playbackData->init();
+        d->playbackData->bindPlaybackViewModel();
+
+        d->tempoData = std::make_unique<TempoViewModelContextData>();
+        d->tempoData->q_ptr = this;
+        d->tempoData->init();
+        d->tempoData->bindTempoSequenceViewModel();
     }
 
     ProjectViewModelContext::~ProjectViewModelContext() = default;
@@ -52,7 +49,32 @@ namespace VisualEditor {
 
     sflow::PlaybackViewModel *ProjectViewModelContext::playbackViewModel() const {
         Q_D(const ProjectViewModelContext);
-        return d->playbackViewModel;
+        return d->playbackData->playbackViewModel;
+    }
+
+    sflow::PointSequenceViewModel *ProjectViewModelContext::tempoSequenceViewModel() const {
+        Q_D(const ProjectViewModelContext);
+        return d->tempoData->tempoSequenceViewModel;
+    }
+
+    sflow::SelectionController *ProjectViewModelContext::tempoSelectionController() const {
+        Q_D(const ProjectViewModelContext);
+        return d->tempoData->tempoSelectionController;
+    }
+
+    sflow::LabelSequenceInteractionController *ProjectViewModelContext::createAndBindLabelSequenceInteractionControllerOfTempo(QObject *parent) {
+        Q_D(ProjectViewModelContext);
+        return d->tempoData->createController(parent);
+    }
+
+    dspx::Tempo *ProjectViewModelContext::getTempoDocumentItemFromViewItem(sflow::LabelViewModel *viewItem) const {
+        Q_D(const ProjectViewModelContext);
+        return d->tempoData->tempoDocumentItemMap.value(viewItem);
+    }
+
+    sflow::LabelViewModel *ProjectViewModelContext::getTempoViewItemFromDocumentItem(dspx::Tempo *item) const {
+        Q_D(const ProjectViewModelContext);
+        return d->tempoData->tempoViewItemMap.value(item);
     }
 
 }
diff --git a/src/plugins/visualeditor/core/ProjectViewModelContext.h b/src/plugins/visualeditor/core/ProjectViewModelContext.h
@@ -8,6 +8,14 @@
 
 namespace sflow {
     class PlaybackViewModel;
+    class PointSequenceViewModel;
+    class LabelSequenceInteractionController;
+    class LabelViewModel;
+    class SelectionController;
+}
+
+namespace dspx {
+    class Tempo;
 }
 
 namespace Core {
@@ -29,6 +37,8 @@ namespace VisualEditor {
         Q_DECLARE_PRIVATE(ProjectViewModelContext)
         Q_PROPERTY(Core::ProjectWindowInterface *windowHandle READ windowHandle CONSTANT)
         Q_PROPERTY(sflow::PlaybackViewModel *playbackViewModel READ playbackViewModel CONSTANT)
+        Q_PROPERTY(sflow::PointSequenceViewModel *tempoSequenceViewModel READ tempoSequenceViewModel CONSTANT)
+        Q_PROPERTY(sflow::SelectionController *tempoSelectionController READ tempoSelectionController CONSTANT)
 
     public:
         ~ProjectViewModelContext() override;
@@ -38,6 +48,15 @@ namespace VisualEditor {
         Core::ProjectWindowInterface *windowHandle() const;
 
         sflow::PlaybackViewModel *playbackViewModel() const;
+        sflow::PointSequenceViewModel *tempoSequenceViewModel() const;
+
+        sflow::SelectionController *tempoSelectionController() const;
+
+        Q_INVOKABLE sflow::LabelSequenceInteractionController *createAndBindLabelSequenceInteractionControllerOfTempo(QObject *parent = nullptr);
+
+        Q_INVOKABLE dspx::Tempo *getTempoDocumentItemFromViewItem(sflow::LabelViewModel *viewItem) const;
+        Q_INVOKABLE sflow::LabelViewModel *getTempoViewItemFromDocumentItem(dspx::Tempo *item) const;
+
 
     private:
         friend class Internal::ProjectAddOn;
diff --git a/src/plugins/visualeditor/core/ProjectViewModelContext_p.h b/src/plugins/visualeditor/core/ProjectViewModelContext_p.h
@@ -1,19 +1,24 @@
 #ifndef DIFFSCOPE_COREPLUGIN_PROJECTVIEWMODELCONTEXT_P_H
 #define DIFFSCOPE_COREPLUGIN_PROJECTVIEWMODELCONTEXT_P_H
 
+#include <memory>
+
 #include <visualeditor/ProjectViewModelContext.h>
 
 namespace VisualEditor {
 
+    class PlaybackViewModelContextData;
+    class TempoViewModelContextData;
+
     class ProjectViewModelContextPrivate {
         Q_DECLARE_PUBLIC(ProjectViewModelContext)
     public:
         ProjectViewModelContext *q_ptr;
 
         Core::ProjectWindowInterface *windowHandle;
-        sflow::PlaybackViewModel *playbackViewModel;
 
-        void bindPlaybackViewModel() const;
+        std::unique_ptr<PlaybackViewModelContextData> playbackData;
+        std::unique_ptr<TempoViewModelContextData> tempoData;
     };
 }
 
diff --git a/src/plugins/visualeditor/core/TempoViewModelContextData.cpp b/src/plugins/visualeditor/core/TempoViewModelContextData.cpp
diff --git a/src/plugins/visualeditor/core/TempoViewModelContextData_p.h b/src/plugins/visualeditor/core/TempoViewModelContextData_p.h
diff --git a/src/plugins/visualeditor/internal/AdditionalTrackLoader.cpp b/src/plugins/visualeditor/internal/AdditionalTrackLoader.cpp
diff --git a/src/plugins/visualeditor/internal/addon/TempoTrackAddOn.cpp b/src/plugins/visualeditor/internal/addon/TempoTrackAddOn.cpp
diff --git a/src/plugins/visualeditor/qml/additionaltracks/TempoTrack.qml b/src/plugins/visualeditor/qml/additionaltracks/TempoTrack.qml

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ namespace Core {`
`9`	`9`	`public:`
`10`	`10`	`DspxDocument *q_ptr;`
`11`	`11`	`dspx::Model *model;`
	`12`	`+ dspx::SelectionModel *selectionModel;`
`12`	`13`	`TransactionController *transactionController;`
`13`	`14`	`};`
`14`	`15`	`}`