Merge pull request audacity#6409 from igorkorsukov/clipsview/zoom

[AU4] Added change zoom and offset by mouse wheel
Binaergewitter · May 9, 2024 · 3ff2077 · 3ff2077
2 parents b4f60e7 + 3e8212a
commit 3ff2077
Show file tree

Hide file tree

Showing 12 changed files with 207 additions and 132 deletions.
diff --git a/au4/src/projectscene/CMakeLists.txt b/au4/src/projectscene/CMakeLists.txt
@@ -39,8 +39,8 @@ set(MODULE_SRC
 
     ${CMAKE_CURRENT_LIST_DIR}/view/clipsview/clipslistmodel.cpp
     ${CMAKE_CURRENT_LIST_DIR}/view/clipsview/clipslistmodel.h
-    ${CMAKE_CURRENT_LIST_DIR}/view/clipsview/TimelineContext.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/view/clipsview/TimelineContext.h
+    ${CMAKE_CURRENT_LIST_DIR}/view/clipsview/timelinecontext.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/view/clipsview/timelinecontext.h
     ${CMAKE_CURRENT_LIST_DIR}/view/clipsview/trackslistclipsmodel.cpp
     ${CMAKE_CURRENT_LIST_DIR}/view/clipsview/trackslistclipsmodel.h
     ${CMAKE_CURRENT_LIST_DIR}/view/clipsview/waveview.cpp

diff --git a/au4/src/projectscene/projectscene.qrc b/au4/src/projectscene/projectscene.qrc
@@ -11,5 +11,6 @@
         <file>qml/Audacity/ProjectScene/clipsview/TracksClipsView.qml</file>
         <file>qml/Audacity/ProjectScene/clipsview/TrackClipsItem.qml</file>
         <file>qml/Audacity/ProjectScene/clipsview/ClipItem.qml</file>
+        <file>qml/Audacity/ProjectScene/clipsview/Timeline.qml</file>
     </qresource>
 </RCC>
diff --git a/au4/src/projectscene/projectscenemodule.cpp b/au4/src/projectscene/projectscenemodule.cpp
@@ -31,7 +31,7 @@
 #include "view/clipsview/trackslistclipsmodel.h"
 #include "view/clipsview/clipslistmodel.h"
 #include "view/clipsview/waveview.h"
-#include "view/clipsview/TimelineContext.h"
+#include "view/clipsview/timelinecontext.h"
 
 using namespace au::projectscene;
 using namespace muse::modularity;

diff --git a/au4/src/projectscene/qml/Audacity/ProjectScene/clipsview/Timeline.qml b/au4/src/projectscene/qml/Audacity/ProjectScene/clipsview/Timeline.qml
@@ -0,0 +1,31 @@
+import QtQuick
+
+import Muse.UiComponents
+
+import Audacity.ProjectScene
+
+Rectangle {
+
+    id: root
+
+    property alias context: timelineContext
+
+    height: 76
+    color: ui.theme.backgroundPrimaryColor
+
+    function onWheel(y) {
+        timelineContext.onWheel(y)
+    }
+
+    TimelineContext {
+        id: timelineContext
+    }
+
+    StyledTextLabel {
+        anchors.fill: parent
+        anchors.leftMargin: 16
+        text: "zoom: " + timelineContext.zoom + ", offset: " + timelineContext.offset
+    }
+
+    SeparatorLine { anchors.bottom: parent.bottom }
+}
diff --git a/au4/src/projectscene/qml/Audacity/ProjectScene/clipsview/TracksClipsView.qml b/au4/src/projectscene/qml/Audacity/ProjectScene/clipsview/TracksClipsView.qml
@@ -4,10 +4,12 @@ import Muse.UiComponents
 
 import Audacity.ProjectScene
 
-TimelineContext
-{
+Item {
+
     id: root
 
+    clip: true
+
     TracksListClipsModel {
         id: tracksModel
     }
@@ -16,40 +18,36 @@ TimelineContext
         tracksModel.load()
     }
 
-
-    Item {
-        id: header
+    Timeline {
+        id: timeline
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-
-        height: 76
-
-        SeparatorLine { anchors.bottom: parent.bottom }
     }
 
-    ListView {
-        id: tracksView
+    MouseArea {
+        anchors.fill: parent
+        onWheel: function(wheel) {
+            timeline.onWheel(wheel.angleDelta.y)
+        }
+    }
 
-        anchors.top: header.bottom
+    Column {
+        anchors.top: timeline.bottom
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.bottom: parent.bottom
 
-        clip: true
-
-        pixelAligned: true
-
-        flickableDirection: Flickable.VerticalFlick
-
-        model: tracksModel
-        delegate: TrackClipsItem {
-            anchors.left: parent.left
-            anchors.right: parent.right
-            height: 144
-            context: root
-            trackId: trackIdData
+        Repeater {
+            model: tracksModel
+            delegate: TrackClipsItem {
+                anchors.left: parent.left
+                anchors.right: parent.right
+                height: 144
+                context: timeline.context
+                trackId: trackIdData
+            }
         }
     }
 }
diff --git a/au4/src/projectscene/view/clipsview/TimelineContext.cpp b/au4/src/projectscene/view/clipsview/TimelineContext.cpp
diff --git a/au4/src/projectscene/view/clipsview/clipslistmodel.cpp b/au4/src/projectscene/view/clipsview/clipslistmodel.cpp
@@ -23,6 +23,9 @@ void ClipsListModel::load()
         return;
     }
 
+    connect(m_context, &TimelineContext::zoomChanged, this, &ClipsListModel::onTimelineContextChanged);
+    connect(m_context, &TimelineContext::offsetChanged, this, &ClipsListModel::onTimelineContextChanged);
+
     beginResetModel();
 
     m_clipList = prj->clipList(m_trackId);
@@ -34,8 +37,6 @@ void ClipsListModel::load()
         emit dataChanged(idx, idx);
     });
 
-    //! TODO Subscribe
-
     endResetModel();
 }
 
@@ -60,7 +61,7 @@ QVariant ClipsListModel::data(const QModelIndex& index, int role) const
     case ClipTitleRole:
         return clip.title.toQString();
     case ClipWidthRole: {
-        qint64 width = m_context->timeToPosition(clip.endTime - clip.startTime);
+        qint64 width = (clip.endTime - clip.startTime) * m_context->zoom();
         return width;
     } break;
     case ClipLeftRole: {
@@ -87,6 +88,14 @@ bool ClipsListModel::setData(const QModelIndex& index, const QVariant& value, in
     return false;
 }
 
+void ClipsListModel::onTimelineContextChanged()
+{
+    for (size_t i = 0; i < m_clipList.size(); ++i) {
+        QModelIndex idx = this->index(int(i));
+        emit dataChanged(idx, idx, { ClipWidthRole, ClipLeftRole });
+    }
+}
+
 bool ClipsListModel::changeClipStartTime(const QModelIndex& index, const QVariant& value)
 {
     au::processing::Clip& clip = m_clipList[index.row()];

diff --git a/au4/src/projectscene/view/clipsview/clipslistmodel.h b/au4/src/projectscene/view/clipsview/clipslistmodel.h
@@ -9,7 +9,7 @@
 #include "global/async/asyncable.h"
 #include "processing/processingtypes.h"
 
-#include "TimelineContext.h"
+#include "timelinecontext.h"
 
 namespace au::projectscene {
 class ClipsListModel : public QAbstractListModel, public muse::async::Asyncable
@@ -41,6 +41,9 @@ class ClipsListModel : public QAbstractListModel, public muse::async::Asyncable
 signals:
     void trackIdChanged();
 
+private slots:
+    void onTimelineContextChanged();
+
 private:
 
     enum RoleNames {