Add phoneme editor view and update other views

Author: CrSjimo

src/libs/3rdparty/dspxmodel

@@ -16,6 +16,7 @@
 #include <ScopicFlowCore/LabelSequenceInteractionController.h>
 #include <ScopicFlowCore/NoteEditLayerInteractionController.h>
 #include <ScopicFlowCore/ParameterEditorInteractionController.h>
+#include <ScopicFlowCore/PhonemeSequenceInteractionController.h>
 #include <ScopicFlowCore/ScrollBehaviorViewModel.h>
 #include <ScopicFlowCore/TimeLayoutViewModel.h>
 #include <ScopicFlowCore/TimeManipulator.h>
@@ -416,6 +417,7 @@ namespace VisualEditor {
         d->labelSequenceInteractionControllerOfKeySignature = ProjectViewModelContext::of(d->windowHandle)->createAndBindLabelSequenceInteractionControllerOfKeySignature(this);
         d->labelSequenceInteractionControllerOfLabel = ProjectViewModelContext::of(d->windowHandle)->createAndBindLabelSequenceInteractionControllerOfLabel(this);
         d->noteEditLayerInteractionController = ProjectViewModelContext::of(d->windowHandle)->createAndBindNoteEditLayerInteractionController(this);
+        d->phonemeSequenceInteractionController = ProjectViewModelContext::of(d->windowHandle)->createAndBindPhonemeSequenceInteractionController(this);
         d->clavierViewModel = new sflow::ClavierViewModel(this);
         d->clavierInteractionController = new sflow::ClavierInteractionController(this);
 
@@ -556,6 +558,11 @@ namespace VisualEditor {
         return d->noteEditLayerInteractionController;
     }
 
+    sflow::PhonemeSequenceInteractionController *PianoRollPanelInterface::phonemeSequenceInteractionController() const {
+        Q_D(const PianoRollPanelInterface);
+        return d->phonemeSequenceInteractionController;
+    }
+
     sflow::ClavierViewModel *PianoRollPanelInterface::clavierViewModel() const {
         Q_D(const PianoRollPanelInterface);
         return d->clavierViewModel;

src/libs/3rdparty/scopicflow

@@ -17,6 +17,7 @@ namespace sflow {
     class TimelineInteractionController;
     class LabelSequenceInteractionController;
     class NoteEditLayerInteractionController;
+    class PhonemeSequenceInteractionController;
     class ClavierViewModel;
     class ClavierInteractionController;
 }
@@ -54,6 +55,7 @@ namespace VisualEditor {
         Q_PROPERTY(sflow::LabelSequenceInteractionController *labelSequenceInteractionControllerOfKeySignature READ labelSequenceInteractionControllerOfKeySignature CONSTANT)
         Q_PROPERTY(sflow::LabelSequenceInteractionController *labelSequenceInteractionControllerOfLabel READ labelSequenceInteractionControllerOfLabel CONSTANT)
         Q_PROPERTY(sflow::NoteEditLayerInteractionController *noteEditLayerInteractionController READ noteEditLayerInteractionController CONSTANT)
+        Q_PROPERTY(sflow::PhonemeSequenceInteractionController *phonemeSequenceInteractionController READ phonemeSequenceInteractionController CONSTANT)
         Q_PROPERTY(sflow::ClavierViewModel *clavierViewModel READ clavierViewModel CONSTANT)
         Q_PROPERTY(sflow::ClavierInteractionController *clavierInteractionController READ clavierInteractionController CONSTANT)
         Q_PROPERTY(PositionAlignmentManipulator *positionAlignmentManipulator READ positionAlignmentManipulator CONSTANT)
@@ -83,6 +85,7 @@ namespace VisualEditor {
         sflow::LabelSequenceInteractionController *labelSequenceInteractionControllerOfKeySignature() const;
         sflow::LabelSequenceInteractionController *labelSequenceInteractionControllerOfLabel() const;
         sflow::NoteEditLayerInteractionController *noteEditLayerInteractionController() const;
+        sflow::PhonemeSequenceInteractionController *phonemeSequenceInteractionController() const;
         sflow::ClavierViewModel *clavierViewModel() const;
         sflow::ClavierInteractionController *clavierInteractionController() const;
 

src/plugins/visualeditor/core/PianoRollPanelInterface.cpp

@@ -36,6 +36,7 @@ namespace VisualEditor {
         sflow::LabelSequenceInteractionController *labelSequenceInteractionControllerOfKeySignature;
         sflow::LabelSequenceInteractionController *labelSequenceInteractionControllerOfLabel;
         sflow::NoteEditLayerInteractionController *noteEditLayerInteractionController;
+        sflow::PhonemeSequenceInteractionController *phonemeSequenceInteractionController;
         sflow::ClavierViewModel *clavierViewModel;
         sflow::ClavierInteractionController *clavierInteractionController;
 

src/plugins/visualeditor/core/PianoRollPanelInterface.h

@@ -7,6 +7,7 @@
 #include <ScopicFlowCore/PlaybackViewModel.h>
 #include <ScopicFlowCore/ListViewModel.h>
 #include <ScopicFlowCore/NoteViewModel.h>
+#include <ScopicFlowCore/PhonemeSequenceInteractionController.h>
 #include <ScopicFlowCore/PointSequenceViewModel.h>
 #include <ScopicFlowCore/LabelViewModel.h>
 #include <ScopicFlowCore/RangeSequenceViewModel.h>
@@ -41,6 +42,7 @@
 #include <visualeditor/private/TrackViewModelContextData_p.h>
 #include <visualeditor/private/MasterTrackViewModelContextData_p.h>
 #include <visualeditor/private/NoteViewModelContextData_p.h>
+#include <visualeditor/private/PhonemeViewModelContextData_p.h>
 #include <visualeditor/private/NoteSelectionController_p.h>
 #include <visualeditor/DynamicMixingEditorContext.h>
 #include <visualeditor/ParameterEditorContext.h>
@@ -97,6 +99,11 @@ namespace VisualEditor {
         d->noteData->init();
         d->noteData->bindTrackSequences();
 
+        d->phonemeData = std::make_unique<PhonemeViewModelContextData>();
+        d->phonemeData->q_ptr = this;
+        d->phonemeData->init();
+        d->phonemeData->bindTrackSequences();
+
         d->parameterEditorContext = new ParameterEditorContext(this);
         d->dynamicMixingEditorContext = new DynamicMixingEditorContext(this);
 
@@ -236,6 +243,11 @@ namespace VisualEditor {
         return d->noteData->createController(parent);
     }
 
+    sflow::PhonemeSequenceInteractionController *ProjectViewModelContext::createAndBindPhonemeSequenceInteractionController(QObject *parent) {
+        Q_D(ProjectViewModelContext);
+        return d->phonemeData->createController(parent);
+    }
+
     sflow::TrackListInteractionController *ProjectViewModelContext::createAndBindTrackListInteractionController(QObject *parent) {
         Q_D(ProjectViewModelContext);
         return d->trackData->createController(parent);
@@ -316,6 +328,11 @@ namespace VisualEditor {
         return d->noteData->noteSequenceViewModelMap.value(clip);
     }
 
+    sflow::PointSequenceViewModel *ProjectViewModelContext::getPhonemeSequenceViewModel(dspx::SingingClip *clip) const {
+        Q_D(const ProjectViewModelContext);
+        return d->phonemeData->phonemeSequenceViewModelMap.value(clip);
+    }
+
 }
 
 #include "moc_ProjectViewModelContext.cpp"

src/plugins/visualeditor/core/PianoRollPanelInterface_p.h

@@ -12,6 +12,7 @@ namespace sflow {
     class ClipViewModel;
     class NoteEditLayerInteractionController;
     class NoteViewModel;
+    class PhonemeSequenceInteractionController;
     class RangeSequenceViewModel;
     class PointSequenceViewModel;
     class LabelSequenceInteractionController;
@@ -105,6 +106,7 @@ namespace VisualEditor {
         Q_INVOKABLE sflow::LabelSequenceInteractionController *createAndBindLabelSequenceInteractionControllerOfLabel(QObject *parent = nullptr);
         Q_INVOKABLE sflow::ClipPaneInteractionController *createAndBindClipPaneInteractionController(QObject *parent = nullptr);
         Q_INVOKABLE sflow::NoteEditLayerInteractionController *createAndBindNoteEditLayerInteractionController(QObject *parent = nullptr);
+        Q_INVOKABLE sflow::PhonemeSequenceInteractionController *createAndBindPhonemeSequenceInteractionController(QObject *parent = nullptr);
         Q_INVOKABLE sflow::TrackListInteractionController *createAndBindTrackListInteractionController(QObject *parent = nullptr);
         Q_INVOKABLE sflow::TrackListInteractionController *createAndBindTrackListInteractionControllerOfMaster(QObject *parent = nullptr);
 
@@ -123,6 +125,7 @@ namespace VisualEditor {
 
         Q_INVOKABLE sflow::RangeSequenceViewModel *getSingingClipPerTrackSequenceViewModel(dspx::Track *track) const;
         Q_INVOKABLE sflow::RangeSequenceViewModel *getNoteSequenceViewModel(dspx::SingingClip *clip) const;
+        Q_INVOKABLE sflow::PointSequenceViewModel *getPhonemeSequenceViewModel(dspx::SingingClip *clip) const;
 
 
     private:

src/plugins/visualeditor/core/ProjectViewModelContext.cpp

@@ -13,6 +13,7 @@ namespace VisualEditor {
     class LabelViewModelContextData;
     class ClipViewModelContextData;
     class NoteViewModelContextData;
+    class PhonemeViewModelContextData;
     class TrackViewModelContextData;
     class MasterTrackViewModelContextData;
 
@@ -41,6 +42,7 @@ namespace VisualEditor {
         std::unique_ptr<LabelViewModelContextData> labelData;
         std::unique_ptr<ClipViewModelContextData> clipData;
         std::unique_ptr<NoteViewModelContextData> noteData;
+        std::unique_ptr<PhonemeViewModelContextData> phonemeData;
         std::unique_ptr<TrackViewModelContextData> trackData;
         std::unique_ptr<MasterTrackViewModelContextData> masterTrackData;
         ParameterEditorContext *parameterEditorContext{};