Skip to content
Extraits de code Groupes Projets
Valider e7f4ec5a rédigé par Elliu's avatar Elliu Validation de Elliu
Parcourir les fichiers

Move zoomSlider into TimingParams

As it will probably have more things later, so we can arrange it in
itself and put it wherever we want
parent fe218860
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!29Improve timingView with display of the ASS lines
...@@ -66,19 +66,16 @@ void ...@@ -66,19 +66,16 @@ void
AudioVisualizer::printSpectrum(QImage pixmap, quint64 audioLength) noexcept AudioVisualizer::printSpectrum(QImage pixmap, quint64 audioLength) noexcept
{ {
TimingView *timer = new TimingView(pixmap, audioLength, this); TimingView *timer = new TimingView(pixmap, audioLength, this);
QHBoxLayout *layout = new QHBoxLayout; TimingParams *params = new TimingParams(this);
QSlider *slider = new QSlider(Qt::Vertical); // The only that we want to take all the space is the timer in itself
slider->setMinimum(0); QGridLayout *layout = new QGridLayout;
slider->setMaximum(100); layout->addWidget(timer, 1, 0);
slider->setSingleStep(0); layout->setColumnStretch(0, 10);
slider->setPageStep(0); layout->addWidget(params, 1, 1);
slider->setValue(0); layout->setColumnStretch(1, 0);
setLayout(layout);
connect(slider, &QSlider::valueChanged, timer->getTimingScene()->getAxis(), connect(params->getZoomSlider(), &QSlider::valueChanged, timer->getTimingScene()->getAxis(),
&TimingAxis::refreshTicks); &TimingAxis::refreshTicks);
layout->addWidget(timer);
layout->addWidget(slider);
setLayout(layout);
} }
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#endif #endif
#include "TimingView.hh" #include "TimingView.hh"
#include "TimingParams.hh"
#include "../../Lib/Audio.hh" #include "../../Lib/Audio.hh"
namespace Vivy namespace Vivy
......
#include "TimingParams.hh"
using namespace Vivy;
TimingParams::TimingParams(QWidget *parent) noexcept
: QWidget(parent)
{
QHBoxLayout *layout = new QHBoxLayout;
zoomSlider = std::make_unique<QSlider>(new QSlider(Qt::Vertical));
if (QSlider *slider = zoomSlider.get()) {
slider->setMinimum(0);
slider->setMaximum(100);
slider->setSingleStep(0);
slider->setPageStep(0);
slider->setValue(0);
layout->addWidget(slider);
}
sensibilitySlider = std::make_unique<QSlider>(new QSlider(Qt::Vertical));
if (QSlider *slider = sensibilitySlider.get()) {
slider->setMinimum(0);
slider->setMaximum(100);
slider->setSingleStep(0);
slider->setPageStep(0);
slider->setValue(0);
layout->addWidget(slider);
}
setLayout(layout);
}
QSlider *
TimingParams::getZoomSlider() const noexcept
{
return zoomSlider.get();
}
QSlider *
TimingParams::getSensibilitySlider() const noexcept
{
return sensibilitySlider.get();
}
#ifndef VIVY_TIMING_PARAMS_H
#define VIVY_TIMING_PARAMS_H
#ifndef __cplusplus
#error "This is a C++ header"
#endif
#include "../../Lib/Utils.hh"
#include <QWidget>
#include <QSlider>
#include <QLayout>
namespace Vivy
{
class TimingParams final : public QWidget {
Q_OBJECT
public:
explicit TimingParams(QWidget * = nullptr) noexcept;
private:
std::unique_ptr<QSlider> zoomSlider;
std::unique_ptr<QSlider> sensibilitySlider;
public:
QSlider *getZoomSlider() const noexcept;
QSlider *getSensibilitySlider() const noexcept;
};
}
#endif // VIVY_TIMING_PARAMS_H
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter