Update phoneme editor

Author: CrSjimo

src/plugins/coreplugin/internal/PhonemeListModel.cpp

@@ -74,6 +74,8 @@ namespace Core::Internal {
                 return phoneme->start();
             case OnsetRole:
                 return phoneme->onset();
+            case PhonemeRole:
+                return QVariant::fromValue(phoneme);
             default:
                 return {};
         }
@@ -117,7 +119,8 @@ namespace Core::Internal {
             {TokenRole, "token"},
             {LanguageRole, "language"},
             {StartRole, "start"},
-            {OnsetRole, "onset"}
+            {OnsetRole, "onset"},
+            {PhonemeRole, "phoneme"}
         };
         return roles;
     }

src/plugins/coreplugin/internal/PhonemeListModel.h

@@ -2,6 +2,7 @@
 #define DIFFSCOPE_COREPLUGIN_PHONEMELISTMODEL_H
 
 #include <QAbstractItemModel>
+#include <qqmlintegration.h>
 
 namespace dspx {
     class Phoneme;
@@ -12,6 +13,7 @@ namespace Core::Internal {
 
     class PhonemeListModel : public QAbstractItemModel {
         Q_OBJECT
+        QML_ELEMENT
 
         Q_PROPERTY(dspx::PhonemeSequence *phonemeSequence READ phonemeSequence WRITE setPhonemeSequence NOTIFY phonemeSequenceChanged)
 
@@ -21,6 +23,7 @@ namespace Core::Internal {
             LanguageRole,
             StartRole,
             OnsetRole,
+            PhonemeRole,
         };
         Q_ENUM(Roles)
 

src/plugins/coreplugin/project/scenarios/InsertItemScenario.cpp

@@ -38,6 +38,9 @@
 #include <dspxmodel/NoteSelectionModel.h>
 #include <dspxmodel/Note.h>
 #include <dspxmodel/NoteSequence.h>
+#include <dspxmodel/PhonemeInfo.h>
+#include <dspxmodel/PhonemeSequence.h>
+#include <dspxmodel/Phoneme.h>
 
 #include <coreplugin/DspxDocument.h>
 #include <coreplugin/ProjectTimeline.h>
@@ -313,23 +316,29 @@ namespace Core {
         }
     }
 
-    void InsertItemScenario::insertNote() const {
+    void InsertItemScenario::insertNote(dspx::SingingClip *clip) const {
         Q_D(const InsertItemScenario);
         if (!document() || !d->projectTimeline || !window())
             return;
 
         auto model = document()->model();
         auto selectionModel = document()->selectionModel();
-        auto noteSelectionModel = selectionModel->noteSelectionModel();
 
-        auto noteSequence = noteSelectionModel->noteSequenceWithSelectedItems();
-        if (!noteSequence)
-            return;
+        dspx::NoteSequence *noteSequence = nullptr;
+
+        // If clip is provided, use it and its notes
+        if (clip) {
+            noteSequence = clip->notes();
+        } else {
+            auto noteSelectionModel = selectionModel->noteSelectionModel();
+            noteSequence = noteSelectionModel->noteSequenceWithSelectedItems();
+            if (!noteSequence)
+                return;
+            clip = noteSequence->singingClip();
+        }
 
         qCInfo(lcInsertItemScenario) << "Inserting note";
 
-        auto clip = noteSequence->singingClip();
-
         // Calculate initial position: playback position - clip position
         const int clipPosition = clip->position();
         const int initialPosition = qMax(0, d->projectTimeline->position() - clipPosition);
@@ -376,6 +385,68 @@ namespace Core {
         }
     }
 
+    void InsertItemScenario::insertPhoneme(dspx::Note *note) const {
+        Q_D(const InsertItemScenario);
+        if (!document() || !window())
+            return;
+
+        auto model = document()->model();
+        auto selectionModel = document()->selectionModel();
+
+        // If note is not provided, try to get it from the selection
+        if (!note) {
+            if (selectionModel->selectionType() == dspx::SelectionModel::ST_Note) {
+                auto noteSelectionModel = selectionModel->noteSelectionModel();
+                const auto selectedNotes = noteSelectionModel->selectedItems();
+                if (selectedNotes.isEmpty())
+                    return;
+                note = selectedNotes.first();
+            } else {
+                return;
+            }
+        }
+
+        qCInfo(lcInsertItemScenario) << "Inserting phoneme";
+
+        auto phonemeSequence = note->phonemes()->edited();
+
+        QQmlComponent component(RuntimeInterface::qmlEngine(), "DiffScope.Core", "InsertPhonemeDialog");
+        QVariantMap properties;
+        properties.insert("token", QString());
+        properties.insert("start", 0);
+        properties.insert("language", QString());
+        properties.insert("onset", false);
+        auto dialog = createAndPositionDialog(&component, properties);
+        if (!DocumentEditScenarioPrivate::execDialog(dialog))
+            return;
+
+        const auto token = dialog->property("token").toString();
+        const auto start = dialog->property("start").toInt();
+        const auto language = dialog->property("language").toString();
+        const auto onset = dialog->property("onset").toBool();
+        qCDebug(lcInsertItemScenario) << "Inserting phoneme with token" << token << "start" << start << "language" << language << "onset" << onset << "to note" << note;
+
+        dspx::Phoneme *newPhoneme = nullptr;
+        bool success = false;
+        document()->transactionController()->beginScopedTransaction(tr("Inserting phoneme"), [=, &newPhoneme, &success] {
+            newPhoneme = model->createPhoneme();
+            newPhoneme->setToken(token);
+            newPhoneme->setStart(start);
+            newPhoneme->setLanguage(language);
+            newPhoneme->setOnset(onset);
+            if (!phonemeSequence->insertItem(newPhoneme)) {
+                model->destroyItem(newPhoneme);
+                newPhoneme = nullptr;
+                return false;
+            }
+            success = true;
+            qCDebug(lcInsertItemScenario) << "Inserted phoneme" << newPhoneme;
+            return true;
+        }, [] {
+            qCCritical(lcInsertItemScenario) << "Failed to insert phoneme in exclusive transaction";
+        });
+    }
+
 }
 
 #include "moc_InsertItemScenario.cpp"

src/plugins/coreplugin/project/scenarios/InsertItemScenario.h

@@ -6,6 +6,8 @@
 namespace dspx {
     class Track;
     class Label;
+    class SingingClip;
+    class Note;
 }
 
 namespace Core {
@@ -32,7 +34,8 @@ namespace Core {
         Q_INVOKABLE void insertTrack() const;
         Q_INVOKABLE void insertLabel() const;
         Q_INVOKABLE void insertSingingClip() const;
-        Q_INVOKABLE void insertNote() const;
+        Q_INVOKABLE void insertNote(dspx::SingingClip *clip = nullptr) const;
+        Q_INVOKABLE void insertPhoneme(dspx::Note *note = nullptr) const;
 
     Q_SIGNALS:
         void projectTimelineChanged();

src/plugins/coreplugin/qml/dialogs/InsertPhonemeDialog.qml

@@ -0,0 +1,80 @@
+import QtQml
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import SVSCraft
+import SVSCraft.UIComponents
+
+import DiffScope.UIShell
+import DiffScope.Core
+
+Dialog {
+    id: dialog
+
+    property string token
+    property int start
+    property string language
+    property bool onset
+
+    title: qsTr("Insert Phoneme")
+
+    onAboutToShow: tokenTextField.forceActiveFocus()
+
+    GridLayout {
+        anchors.fill: parent
+        columns: 2
+
+        Label {
+            id: tokenLabel
+            text: qsTr("Token")
+        }
+        TextField {
+            id: tokenTextField
+            Accessible.labelledBy: tokenLabel
+            Accessible.name: tokenLabel.text
+            Layout.fillWidth: true
+            text: dialog.token
+            onTextEdited: dialog.token = text
+        }
+
+        Label {
+            id: startLabel
+            text: qsTr("Start (ms)")
+        }
+        SpinBox {
+            id: startSpinBox
+            Accessible.labelledBy: startLabel
+            Accessible.name: startLabel.text
+            Layout.fillWidth: true
+            value: dialog.start
+            from: -2147483648
+            to: 2147483647
+            onValueModified: dialog.start = value
+        }
+
+        Label {
+            id: languageLabel
+            text: qsTr("Language")
+        }
+        TextField {
+            id: languageTextField
+            Accessible.labelledBy: languageLabel
+            Accessible.name: languageLabel.text
+            Layout.fillWidth: true
+            text: dialog.language
+            onTextEdited: dialog.language = text
+        }
+
+        CheckBox {
+            id: onsetCheckBox
+            Layout.columnSpan: 2
+            Layout.fillWidth: true
+            text: qsTr("Onset")
+            checked: dialog.onset
+            onClicked: dialog.onset = checked
+        }
+    }
+
+    standardButtons: DialogButtonBox.Ok
+}