From 50618a399532acdf70e1766b57cd42201a7172cb Mon Sep 17 00:00:00 2001
From: Elliu <elliu@hashi.re>
Date: Fri, 14 Jan 2022 15:26:06 +0100
Subject: [PATCH] Put timing related files in their directory
---
src/UI/DocumentViews/AudioVisualizer.hh | 4 ++--
.../{ => AudioVisualizer}/TimingAxis.cc | 0
.../{ => AudioVisualizer}/TimingAxis.hh | 2 +-
.../{ => AudioVisualizer}/TimingBar.cc | 0
.../{ => AudioVisualizer}/TimingBar.hh | 0
.../{ => AudioVisualizer}/TimingParams.cc | 0
.../{ => AudioVisualizer}/TimingParams.hh | 2 +-
.../{ => AudioVisualizer}/TimingScene.cc | 24 ++++++++++++-------
.../{ => AudioVisualizer}/TimingScene.hh | 6 ++---
.../{ => AudioVisualizer}/TimingView.cc | 18 +-------------
.../{ => AudioVisualizer}/TimingView.hh | 5 ++--
11 files changed, 25 insertions(+), 36 deletions(-)
rename src/UI/DocumentViews/{ => AudioVisualizer}/TimingAxis.cc (100%)
rename src/UI/DocumentViews/{ => AudioVisualizer}/TimingAxis.hh (97%)
rename src/UI/DocumentViews/{ => AudioVisualizer}/TimingBar.cc (100%)
rename src/UI/DocumentViews/{ => AudioVisualizer}/TimingBar.hh (100%)
rename src/UI/DocumentViews/{ => AudioVisualizer}/TimingParams.cc (100%)
rename src/UI/DocumentViews/{ => AudioVisualizer}/TimingParams.hh (94%)
rename src/UI/DocumentViews/{ => AudioVisualizer}/TimingScene.cc (87%)
rename src/UI/DocumentViews/{ => AudioVisualizer}/TimingScene.hh (93%)
rename src/UI/DocumentViews/{ => AudioVisualizer}/TimingView.cc (67%)
rename src/UI/DocumentViews/{ => AudioVisualizer}/TimingView.hh (87%)
diff --git a/src/UI/DocumentViews/AudioVisualizer.hh b/src/UI/DocumentViews/AudioVisualizer.hh
index 65cbce75..25022705 100644
--- a/src/UI/DocumentViews/AudioVisualizer.hh
+++ b/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
diff --git a/src/UI/DocumentViews/TimingAxis.cc b/src/UI/DocumentViews/AudioVisualizer/TimingAxis.cc
similarity index 100%
rename from src/UI/DocumentViews/TimingAxis.cc
rename to src/UI/DocumentViews/AudioVisualizer/TimingAxis.cc
diff --git a/src/UI/DocumentViews/TimingAxis.hh b/src/UI/DocumentViews/AudioVisualizer/TimingAxis.hh
similarity index 97%
rename from src/UI/DocumentViews/TimingAxis.hh
rename to src/UI/DocumentViews/AudioVisualizer/TimingAxis.hh
index c8694985..4180a9e3 100644
--- a/src/UI/DocumentViews/TimingAxis.hh
+++ b/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
{
diff --git a/src/UI/DocumentViews/TimingBar.cc b/src/UI/DocumentViews/AudioVisualizer/TimingBar.cc
similarity index 100%
rename from src/UI/DocumentViews/TimingBar.cc
rename to src/UI/DocumentViews/AudioVisualizer/TimingBar.cc
diff --git a/src/UI/DocumentViews/TimingBar.hh b/src/UI/DocumentViews/AudioVisualizer/TimingBar.hh
similarity index 100%
rename from src/UI/DocumentViews/TimingBar.hh
rename to src/UI/DocumentViews/AudioVisualizer/TimingBar.hh
diff --git a/src/UI/DocumentViews/TimingParams.cc b/src/UI/DocumentViews/AudioVisualizer/TimingParams.cc
similarity index 100%
rename from src/UI/DocumentViews/TimingParams.cc
rename to src/UI/DocumentViews/AudioVisualizer/TimingParams.cc
diff --git a/src/UI/DocumentViews/TimingParams.hh b/src/UI/DocumentViews/AudioVisualizer/TimingParams.hh
similarity index 94%
rename from src/UI/DocumentViews/TimingParams.hh
rename to src/UI/DocumentViews/AudioVisualizer/TimingParams.hh
index 6cf92c6d..5b9e8c38 100644
--- a/src/UI/DocumentViews/TimingParams.hh
+++ b/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>
diff --git a/src/UI/DocumentViews/TimingScene.cc b/src/UI/DocumentViews/AudioVisualizer/TimingScene.cc
similarity index 87%
rename from src/UI/DocumentViews/TimingScene.cc
rename to src/UI/DocumentViews/AudioVisualizer/TimingScene.cc
index af78ff7a..b6e76efc 100644
--- a/src/UI/DocumentViews/TimingScene.cc
+++ b/src/UI/DocumentViews/AudioVisualizer/TimingScene.cc
@@ -1,8 +1,8 @@
#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)
- handleMousePressEventLine(event, p);
- else if (timingMode == TimingMode::Syl)
- handleMousePressEventSyl(event, p);
- else if (timingMode == TimingMode::Char)
- handleMousePressEventChar(event, p);
+ switch(timingMode){
+ case TimingMode::Line:
+ handleMousePressEventLine(event, p);
+ break;
+ case TimingMode::Syl:
+ handleMousePressEventSyl(event, p);
+ break;
+ case TimingMode::Char:
+ handleMousePressEventChar(event, p);
+ break;
+ }
}
QGraphicsScene::mousePressEvent(event);
diff --git a/src/UI/DocumentViews/TimingScene.hh b/src/UI/DocumentViews/AudioVisualizer/TimingScene.hh
similarity index 93%
rename from src/UI/DocumentViews/TimingScene.hh
rename to src/UI/DocumentViews/AudioVisualizer/TimingScene.hh
index 95d000b2..c6cf5a2a 100644
--- a/src/UI/DocumentViews/TimingScene.hh
+++ b/src/UI/DocumentViews/AudioVisualizer/TimingScene.hh
@@ -1,8 +1,8 @@
#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"
diff --git a/src/UI/DocumentViews/TimingView.cc b/src/UI/DocumentViews/AudioVisualizer/TimingView.cc
similarity index 67%
rename from src/UI/DocumentViews/TimingView.cc
rename to src/UI/DocumentViews/AudioVisualizer/TimingView.cc
index f40b27a6..531b08ea 100644
--- a/src/UI/DocumentViews/TimingView.cc
+++ b/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
{
diff --git a/src/UI/DocumentViews/TimingView.hh b/src/UI/DocumentViews/AudioVisualizer/TimingView.hh
similarity index 87%
rename from src/UI/DocumentViews/TimingView.hh
rename to src/UI/DocumentViews/AudioVisualizer/TimingView.hh
index 1d22b7b9..d0fb66dc 100644
--- a/src/UI/DocumentViews/TimingView.hh
+++ b/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;
};
}
--
GitLab