Automation - implement basic UI/rendering using Polyline

mathesoncalum · mathesoncalum · commit 761f6325aff0 · 2026-03-26T09:46:52.000Z
diff --git a/src/notation/inotationautomation.h b/src/notation/inotationautomation.h
@@ -33,6 +33,9 @@ class INotationAutomation
     virtual bool isAutomationModeEnabled() const = 0;
     virtual void setAutomationModeEnabled(bool enabled) = 0;
     virtual muse::async::Notification automationModeEnabledChanged() const = 0;
+
+    virtual QVariant automationLinesData() const = 0;
+    virtual muse::async::Notification automationLinesDataChanged() const = 0;
 };
 
 using INotationAutomationPtr = std::shared_ptr<INotationAutomation>;
diff --git a/src/notation/internal/masternotation.cpp b/src/notation/internal/masternotation.cpp
@@ -86,7 +86,7 @@ MasterNotation::MasterNotation(project::INotationProject* project, const muse::m
     m_notationPlayback = std::make_shared<NotationPlaybackStub>();
 #endif
 
-    m_notationAutomation = std::make_shared<NotationAutomation>();
+    m_notationAutomation = std::make_shared<NotationAutomation>(this, m_notationChanged);
 
     m_parts->partsChanged().onNotify(this, [this]() {
         notifyAboutNotationChanged();
diff --git a/src/notation/internal/notationautomation.cpp b/src/notation/internal/notationautomation.cpp
@@ -21,9 +21,16 @@
  */
 
 #include "notationautomation.h"
+#include "notationtypes.h"
 
 using namespace mu::notation;
 
+NotationAutomation::NotationAutomation(IGetScore* getScore,
+                                       muse::async::Channel<muse::RectF> notationChanged)
+    : m_getScore(getScore), m_notationChanged(notationChanged)
+{
+}
+
 bool NotationAutomation::isAutomationModeEnabled() const
 {
     return m_isAutomationModeEnabled;
@@ -43,3 +50,56 @@ muse::async::Notification NotationAutomation::automationModeEnabledChanged() con
 {
     return m_automationModeEnabledChanged;
 }
+
+QVariant NotationAutomation::automationLinesData() const
+{
+    // TODO: Entire method is a dummy - here we'll construct from actual automation data...
+    QVariantList dummyAutomationData;
+
+    // Hack - using second system because first is normally the title...
+    const System* systemOne = m_getScore ? m_getScore->score()->systems().at(1) : nullptr;
+    if (!systemOne) {
+        return QVariantList();
+    }
+
+    const muse::PointF systemOnePos = systemOne->canvasPos();
+    for (const SysStaff* staff : systemOne->staves()) {
+        QVariantMap lineData;
+
+        const muse::RectF staffRect = staff->bbox().translated(systemOnePos);
+
+        lineData["x"] = staffRect.x();
+        lineData["y"] = staffRect.y();
+        lineData["width"] = staffRect.width();
+        lineData["height"] = staffRect.height();
+
+        QVariantList points;
+
+        // Dummy points...
+        QVariantMap point1;
+        point1["x"] = 0.10;
+        point1["y"] = 0.50;
+        points << point1;
+
+        QVariantMap point2;
+        point2["x"] = 0.50;
+        point2["y"] = 0.10;
+        points << point2;
+
+        QVariantMap point3;
+        point3["x"] = 0.66;
+        point3["y"] = 0.90;
+        points << point3;
+
+        lineData["points"] = points;
+
+        dummyAutomationData << lineData;
+    }
+
+    return dummyAutomationData;
+}
+
+muse::async::Notification NotationAutomation::automationLinesDataChanged() const
+{
+    return m_automationLinesDataChanged;
+}
diff --git a/src/notation/internal/notationautomation.h b/src/notation/internal/notationautomation.h
@@ -23,16 +23,30 @@
 
 #include "../inotationautomation.h"
 
+#include "igetscore.h"
+#include "async/channel.h"
+#include "draw/types/geometry.h"
+
 namespace mu::notation {
 class NotationAutomation : public INotationAutomation
 {
 public:
+    NotationAutomation(IGetScore* getScore, muse::async::Channel<muse::RectF> notationChanged);
+
     bool isAutomationModeEnabled() const override;
     void setAutomationModeEnabled(bool enabled) override;
     muse::async::Notification automationModeEnabledChanged() const override;
 
+    QVariant automationLinesData() const override;
+    muse::async::Notification automationLinesDataChanged() const override; // TODO: probably a channel specifying indices
+
 private:
+    IGetScore* m_getScore = nullptr;
+    muse::async::Channel<muse::RectF> m_notationChanged;
+
     bool m_isAutomationModeEnabled = false;
     muse::async::Notification m_automationModeEnabledChanged;
+
+    muse::async::Notification m_automationLinesDataChanged;
 };
 }
diff --git a/src/notation/notationtypes.h b/src/notation/notationtypes.h
@@ -63,6 +63,7 @@
 namespace mu::notation {
 using Page = mu::engraving::Page;
 using System = mu::engraving::System;
+using SysStaff = mu::engraving::SysStaff;
 using EngravingItem = mu::engraving::EngravingItem;
 using ElementType = mu::engraving::ElementType;
 using PropertyValue = engraving::PropertyValue;
diff --git a/src/notationscene/qml/MuseScore/NotationScene/NotationView.qml b/src/notationscene/qml/MuseScore/NotationScene/NotationView.qml
@@ -221,11 +221,31 @@ FocusScope {
                     }
 
                     Loader {
+                        id: automationOverlayLoader
+
                         active: notationView.automationMode
                         anchors.fill: notationView
 
                         sourceComponent: AutomationOverlay {
+                            id: automationOverlay
+
                             viewMatrix: notationView.matrix
+
+                            Connections {
+                                target: automationOverlayLoader
+                                function onLoaded() {
+                                    const data = notationView.automationLinesData
+                                    automationOverlay.initAutomationLinesData(data)
+                                }
+                            }
+
+                            Connections {
+                                target: notationView
+                                function onAutomationLinesDataChanged() {
+                                    const data = notationView.automationLinesData
+                                    automationOverlay.initAutomationLinesData(data)
+                                }
+                            }
                         }
                     }
 
diff --git a/src/notationscene/qml/MuseScore/NotationScene/abstractnotationpaintview.cpp b/src/notationscene/qml/MuseScore/NotationScene/abstractnotationpaintview.cpp
@@ -340,11 +340,15 @@ void AbstractNotationPaintView::onLoadNotation(INotationPtr)
     });
 
     // FIXME: only un-/re-subscribe when master notation changes
-    m_notation->masterNotation()->automation()->automationModeEnabledChanged().onNotify(this, [this]() {
+    notationAutomation()->automationModeEnabledChanged().onNotify(this, [this]() {
         scheduleRedraw();
         emit automationModeChanged();
     });
 
+    notationAutomation()->automationLinesDataChanged().onNotify(this, [this]() {
+        emit automationLinesDataChanged();
+    });
+
     if (isMainView()) {
         connect(this, &QQuickPaintedItem::focusChanged, this, [this](bool focused) {
             if (notation()) {
@@ -375,6 +379,7 @@ void AbstractNotationPaintView::onLoadNotation(INotationPtr)
     emit verticalScrollChanged();
     emit viewportChanged();
     emit automationModeChanged();
+    emit automationLinesDataChanged();
 }
 
 void AbstractNotationPaintView::onUnloadNotation(INotationPtr)
@@ -391,7 +396,8 @@ void AbstractNotationPaintView::onUnloadNotation(INotationPtr)
     interaction->shadowNoteChanged().disconnect(this);
     notationPlayback()->loopBoundariesChanged().disconnect(this);
     m_notation->viewModeChanged().disconnect(this);
-    m_notation->masterNotation()->automation()->automationModeEnabledChanged().disconnect(this);
+    notationAutomation()->automationModeEnabledChanged().disconnect(this);
+    notationAutomation()->automationLinesDataChanged().disconnect(this);
 
     if (isMainView()) {
         disconnect(this, &QQuickPaintedItem::focusChanged, this, nullptr);
@@ -558,6 +564,12 @@ INotationSelectionPtr AbstractNotationPaintView::notationSelection() const
     return notationInteraction() ? notationInteraction()->selection() : nullptr;
 }
 
+INotationAutomationPtr AbstractNotationPaintView::notationAutomation() const
+{
+    const IMasterNotationPtr masterNotation = m_notation ? m_notation->masterNotation() : nullptr;
+    return masterNotation ? masterNotation->automation() : nullptr;
+}
+
 void AbstractNotationPaintView::onNoteInputStateChanged()
 {
     TRACEFUNC;
@@ -694,7 +706,7 @@ void AbstractNotationPaintView::paint(QPainter* qp)
     painter->setWorldTransform(m_matrix * guiScalingCompensation);
 
     const bool isPrinting = publishMode() || m_inputController->readonly();
-    const bool isAutomation = notation()->masterNotation()->automation()->isAutomationModeEnabled();
+    const bool isAutomation = automationMode();
     notation()->painting()->paintView(painter, toLogical(rect), isPrinting, isAutomation);
 
     const INotationNoteInputPtr noteInput = notationNoteInput();
@@ -848,6 +860,11 @@ QRectF AbstractNotationPaintView::viewport_property() const
     return viewport().toQRectF();
 }
 
+QVariant AbstractNotationPaintView::automationLinesData() const
+{
+    return notationAutomation() ? notationAutomation()->automationLinesData() : QVariant();
+}
+
 RectF AbstractNotationPaintView::notationContentRect() const
 {
     TRACEFUNC;
@@ -1639,12 +1656,7 @@ void AbstractNotationPaintView::setPublishMode(bool arg)
 
 bool AbstractNotationPaintView::automationMode() const
 {
-    const IMasterNotationPtr masterNotation = m_notation ? m_notation->masterNotation() : nullptr;
-    const INotationAutomationPtr automation = masterNotation ? masterNotation->automation() : nullptr;
-    if (!automation) {
-        return false;
-    }
-    return automation->isAutomationModeEnabled();
+    return notationAutomation() ? notationAutomation()->isAutomationModeEnabled() : false;
 }
 
 bool AbstractNotationPaintView::isMainView() const
diff --git a/src/notationscene/qml/MuseScore/NotationScene/abstractnotationpaintview.h b/src/notationscene/qml/MuseScore/NotationScene/abstractnotationpaintview.h
@@ -64,6 +64,8 @@ class AbstractNotationPaintView : public muse::uicomponents::QuickPaintedView, p
     Q_PROPERTY(QVariant matrix READ matrix NOTIFY matrixChanged)
     Q_PROPERTY(QRectF viewport READ viewport_property NOTIFY viewportChanged)
 
+    Q_PROPERTY(QVariant automationLinesData READ automationLinesData NOTIFY automationLinesDataChanged)
+
     Q_PROPERTY(bool publishMode READ publishMode WRITE setPublishMode NOTIFY publishModeChanged)
     Q_PROPERTY(bool automationMode READ automationMode NOTIFY automationModeChanged)
 
@@ -149,6 +151,8 @@ class AbstractNotationPaintView : public muse::uicomponents::QuickPaintedView, p
     muse::RectF viewport() const;
     QRectF viewport_property() const;
 
+    QVariant automationLinesData() const;
+
     bool publishMode() const;
     void setPublishMode(bool arg);
 
@@ -174,6 +178,8 @@ class AbstractNotationPaintView : public muse::uicomponents::QuickPaintedView, p
     void publishModeChanged();
     void automationModeChanged();
 
+    void automationLinesDataChanged();
+
     void activeFocusRequested();
 
     void isMainViewChanged(bool isMainView);
@@ -212,6 +218,7 @@ protected slots:
     INotationElementsPtr notationElements() const;
     INotationStylePtr notationStyle() const;
     INotationSelectionPtr notationSelection() const;
+    INotationAutomationPtr notationAutomation() const;
 
     void clear();
     void initBackground();
diff --git a/src/playback/qml/MuseScore/Playback/automationoverlay.cpp b/src/playback/qml/MuseScore/Playback/automationoverlay.cpp
diff --git a/src/playback/qml/MuseScore/Playback/automationoverlay.h b/src/playback/qml/MuseScore/Playback/automationoverlay.h
