Put timing related files in their directory

src/UI/DocumentViews/AudioVisualizer.hh

@@ -5,8 +5,8 @@
 #error "This is a C++ header"
 #endif
 
-#include "TimingView.hh"
-#include "TimingParams.hh"
+#include "AudioVisualizer/TimingView.hh"
+#include "AudioVisualizer/TimingParams.hh"
 #include "../../Lib/Audio.hh"
 
 namespace Vivy

src/UI/DocumentViews/TimingAxis.hh → src/UI/DocumentViews/AudioVisualizer/TimingAxis.hh

@@ -9,7 +9,7 @@
 #include <QPainter>
 #include <QGraphicsScene>
 #include <cmath>
-#include "../../Lib/Audio.hh"
+#include "../../../Lib/Audio.hh"
 
 namespace Vivy
 {

src/UI/DocumentViews/TimingParams.hh → src/UI/DocumentViews/AudioVisualizer/TimingParams.hh

@@ -5,7 +5,7 @@
 #error "This is a C++ header"
 #endif
 
-#include "../../Lib/Utils.hh"
+#include "../../../Lib/Utils.hh"
 
 #include <QWidget>
 #include <QSlider>

src/UI/DocumentViews/TimingScene.cc → src/UI/DocumentViews/AudioVisualizer/TimingScene.cc

 #include "TimingScene.hh"
 
-#include "../../Lib/Utils.hh"
-#include "../../Lib/Ass/Ass.hh"
-#include "../../Lib/Document/VivyDocument.hh"
+#include "../../../Lib/Utils.hh"
+#include "../../../Lib/Ass/Ass.hh"
+#include "../../../Lib/Document/VivyDocument.hh"
 
 #include <QGraphicsLineItem>
 #include <QGraphicsPixmapItem>
@@ -29,6 +29,7 @@ TimingScene::TimingScene(QImage img_, AudioContext::StreamPtr stream, QWidget *p
     , audioStream(stream)
 {
     QPixmap pixmap(QPixmap::fromImage(img));
+    setSceneRect(QRect(pixmap.rect()));
     backgroundImg = addPixmap(pixmap);
     ax = new TimingAxis(stream, 0, pixmap.width(), 10);
     addItem(ax);
@@ -70,12 +71,17 @@ TimingScene::mousePressEvent(QGraphicsSceneMouseEvent *event) noexcept
 
     if (p && (got == nullptr || got == backgroundImg)) {
         // Handle the different cases
-        if (timingMode == TimingMode::Line)
+        switch(timingMode){
+            case TimingMode::Line:
                 handleMousePressEventLine(event, p);
-        else if (timingMode == TimingMode::Syl)
+                break;
+            case TimingMode::Syl:
                 handleMousePressEventSyl(event, p);
-        else if (timingMode == TimingMode::Char)
+                break;
+            case TimingMode::Char:
                 handleMousePressEventChar(event, p);
+                break;
+        }
     }
 
     QGraphicsScene::mousePressEvent(event);

src/UI/DocumentViews/TimingScene.hh → src/UI/DocumentViews/AudioVisualizer/TimingScene.hh

 #pragma once
 
-#include "../../Lib/Utils.hh"
-#include "../../Lib/Audio.hh"
-#include "../../Lib/Ass/Ass.hh"
+#include "../../../Lib/Utils.hh"
+#include "../../../Lib/Audio.hh"
+#include "../../../Lib/Ass/Ass.hh"
 #include "TimingBar.hh"
 #include "TimingAxis.hh"
 

src/UI/DocumentViews/TimingView.cc → src/UI/DocumentViews/AudioVisualizer/TimingView.cc

@@ -18,6 +18,7 @@ TimingView::TimingView(QImage img, AudioContext::StreamPtr stream, QWidget *pare
     horizontalScrollBar()->setValue(horizontalScrollBar()->minimum());
 
     setScene(currentScene);
+    centerOn(0,height());
 }
 
 void
@@ -27,23 +28,6 @@ TimingView::wheelEvent(QWheelEvent *event) noexcept
                                     event->angleDelta().y() * wheelAngleToScrollRatio);
 }
 
-void
-TimingView::mousePressEvent(QMouseEvent *event) noexcept
-{
-    QPoint pos = event->pos();
-    pos.rx() += horizontalScrollBar()->value();
-    int x = event->pos().x() + horizontalScrollBar()->value();
-
-    QGraphicsItem *got;
-    if ((got = currentScene->itemAt(pos, QTransform())) == nullptr || got == currentScene->bg()) {
-        const int height = static_cast<int>(currentScene->height());
-        currentScene->addItem(new TimingBar(
-            QLine(x, 0, x, height), event->button() == Qt::LeftButton ? startColour : endColour));
-    }
-
-    QGraphicsView::mousePressEvent(event);
-}
-
 void
 TimingView::moveScrollBarToBottom(int, int max) noexcept
 {

src/UI/DocumentViews/TimingView.hh → src/UI/DocumentViews/AudioVisualizer/TimingView.hh

@@ -4,8 +4,8 @@
 #error "This is a C++ header"
 #endif
 
-#include "../../Lib/Utils.hh"
-#include "../../Lib/Audio.hh"
+#include "../../../Lib/Utils.hh"
+#include "../../../Lib/Audio.hh"
 #include "TimingBar.hh"
 #include "TimingScene.hh"
 #include "TimingAxis.hh"
@@ -32,7 +32,6 @@ private:
     AudioContext::StreamPtr audioStream;
 
 public slots:
-    void mousePressEvent(QMouseEvent *event) noexcept override;
     void moveScrollBarToBottom(int, int) noexcept;
 };
 }