2021-03-11 Fred Gleason <fredg@paravelsystems.com>

* Added a 'RDWaveWidget' class.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-03-11 11:27:04 -05:00
parent 31af64e9aa
commit 066be2b9e8
20 changed files with 852 additions and 34 deletions

View File

@@ -53,7 +53,8 @@ noinst_PROGRAMS = audio_convert_test\
timer_test\
upload_test\
wav_chunk_test\
wavescene_test
wavescene_test\
wavewidget_test
dist_audio_convert_test_SOURCES = audio_convert_test.cpp audio_convert_test.h
audio_convert_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@
@@ -145,6 +146,10 @@ dist_wavescene_test_SOURCES = wavescene_test.cpp wavescene_test.h
nodist_wavescene_test_SOURCES = moc_wavescene_test.cpp
wavescene_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@
dist_wavewidget_test_SOURCES = wavewidget_test.cpp wavewidget_test.h
nodist_wavewidget_test_SOURCES = moc_wavewidget_test.cpp
wavewidget_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@
EXTRA_DIST = rivendell_standard.txt\
visualtraffic.txt

View File

@@ -87,19 +87,35 @@ MainWidget::MainWidget(QWidget *parent)
d_view=new QGraphicsView(this);
d_up_button=new RDTransportButton(RDTransportButton::Up,this);
//
// X Shrink Factor
//
d_shrink_factor_group=new QGroupBox(tr("X Shrink Factor"),this);
d_shrink_factor_group->setFont(d_font_engine->labelFont());
d_up_button=
new RDTransportButton(RDTransportButton::Up,d_shrink_factor_group);
connect(d_up_button,SIGNAL(clicked()),this,SLOT(upShrinkData()));
d_down_button=new RDTransportButton(RDTransportButton::Down,this);
d_down_button=
new RDTransportButton(RDTransportButton::Down,d_shrink_factor_group);
connect(d_down_button,SIGNAL(clicked()),this,SLOT(downShrinkData()));
d_shrink_factor_edit=new QLineEdit(this);
d_shrink_factor_edit=new QLineEdit(d_shrink_factor_group);
d_shrink_factor_edit->setReadOnly(true);
d_shrink_factor_edit->setText("1");
d_shrink_factor_label=new QLabel(tr("X Shrink Factor"),this);
d_shrink_factor_label->setFont(d_font_engine->labelFont());
d_shrink_factor_label->setAlignment(Qt::AlignCenter);
//
// Audio Gain
//
d_audio_gain_label=new QLabel(tr("Audio Gain")+":",this);
d_audio_gain_label->setFont(d_font_engine->labelFont());
d_audio_gain_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
d_audio_gain_spin=new QSpinBox(this);
d_audio_gain_spin->setRange(0,100);
d_audio_gain_unit=new QLabel(tr("dB")+":",this);
d_audio_gain_unit->setFont(d_font_engine->labelFont());
d_audio_gain_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
connect(d_audio_gain_spin,SIGNAL(valueChanged(int)),
this,SLOT(gainChangedData(int)));
//
// Connect to ripcd(8)
@@ -107,12 +123,15 @@ MainWidget::MainWidget(QWidget *parent)
connect(rda,SIGNAL(userChanged()),this,SLOT(userData()));
rda->ripc()->
connectHost("localhost",RIPCD_TCP_PORT,rda->config()->password());
setMinimumSize(sizeHint());
setMaximumHeight(sizeHint().height());
}
QSize MainWidget::sizeHint() const
{
return QSize(1000,450);
return QSize(1000,375);
}
@@ -155,16 +174,29 @@ void MainWidget::downShrinkData()
}
void MainWidget::gainChangedData(int db)
{
LoadWave();
}
void MainWidget::resizeEvent(QResizeEvent *e)
{
// int w=size().height();
int h=size().height();
if(d_view!=NULL) {
d_view->setGeometry(0,0,size().width(),300);
d_view->setGeometry(0,0,size().width(),h-155);
}
d_shrink_factor_label->setGeometry(10,302,200,20);
d_up_button->setGeometry(15,325,80,50);
d_down_button->setGeometry(15,385,80,50);
d_shrink_factor_edit->setGeometry(110,325,50,20);
d_shrink_factor_group->setGeometry(10,h-150,155,145);
d_up_button->setGeometry(10,25,80,50);
d_down_button->setGeometry(10,80,80,50);
d_shrink_factor_edit->setGeometry(100,25,50,20);
d_audio_gain_label->setGeometry(200,h-120,100,20);
d_audio_gain_spin->setGeometry(305,h-120,50,20);
d_audio_gain_unit->setGeometry(360,h-120,50,20);
}
@@ -175,15 +207,20 @@ void MainWidget::LoadWave()
if(d_scene!=NULL) {
d_scene->deleteLater();
}
d_scene=new RDWaveScene(d_cut,d_channel,d_energy_data,x_shrink,this);
d_scene=new RDWaveScene(d_energy_data,x_shrink,
(qreal)d_audio_gain_spin->value(),size().height()-175,
this);
QGraphicsTextItem *t_item=
d_scene->addText(QString().sprintf("%d frames/pixel",1152*x_shrink),
d_font_engine->bigLabelFont());
t_item->setDefaultTextColor(Qt::red);
// t_item->setPos(10.0,-35.0);
d_view->setScene(d_scene);
d_view->show();
d_view->setGeometry(0,0,size().width(),300);
// d_view->setGeometry(0,0,size().width(),size().height()-
// 175+d_view->scrollBarWidgets(Qt::AlignBottom).at(0)->size().height());
d_view->setGeometry(0,0,size().width(),size().height()-155);
}
@@ -202,8 +239,8 @@ void MainWidget::LoadEnergy()
}
d_energy_data.clear();
for(unsigned i=0;i<conv->energySize();i+=2) {
d_energy_data.push_back(conv->energy(i)/256);
//d_energy_data.push_back(conv->energy(i));
// d_energy_data.push_back(conv->energy(i)/256);
d_energy_data.push_back(conv->energy(i));
}
delete conv;

View File

@@ -22,8 +22,10 @@
#define WAVESCENE_TEST_H
#include <QGraphicsView>
#include <QGroupBox>
#include <QLabel>
#include <QLineEdit>
#include <QSpinBox>
#include <QWidget>
#include <rdfontengine.h>
@@ -43,6 +45,7 @@ class MainWidget : public QWidget
void userData();
void upShrinkData();
void downShrinkData();
void gainChangedData(int db);
protected:
void resizeEvent(QResizeEvent *e);
@@ -61,7 +64,10 @@ class MainWidget : public QWidget
RDTransportButton *d_up_button;
RDTransportButton *d_down_button;
QLineEdit *d_shrink_factor_edit;
QLabel *d_shrink_factor_label;
QGroupBox *d_shrink_factor_group;
QLabel *d_audio_gain_label;
QSpinBox *d_audio_gain_spin;
QLabel *d_audio_gain_unit;
};

232
tests/wavewidget_test.cpp Normal file
View File

@@ -0,0 +1,232 @@
// wavewidget_test.cpp
//
// Test harness for RDWaveWidget
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
// published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <QApplication>
#include <QGraphicsTextItem>
#include <QMessageBox>
#include <rdapplication.h>
#include <rdpeaksexport.h>
#include "wavewidget_test.h"
MainWidget::MainWidget(QWidget *parent)
: QWidget(parent)
{
QString err_msg;
bool ok=false;
d_cart_number=0;
d_cut_number=-1;
bool track_mode_set=false;
//
// Open the database
//
rda=new RDApplication("wavewidget_test","wavewidget_test",WAVEWIDGET_TEST_USAGE,
this);
if(!rda->open(&err_msg)) {
QMessageBox::critical(this,"wavewidget_test - "+tr("Error"),err_msg);
exit(RDApplication::ExitNoDb);
}
d_font_engine=new RDFontEngine(font(),rda->config());
//
// Get Command Switches
//
for(unsigned i=0;i<rda->cmdSwitch()->keys();i++) {
if(rda->cmdSwitch()->key(i)=="--cart-number") {
d_cart_number=rda->cmdSwitch()->value(i).toUInt(&ok);
if((!ok)||(d_cart_number>RD_MAX_CART_NUMBER)) {
fprintf(stderr,"wavewidget_test: invalid cart number\n");
exit(RDApplication::ExitInvalidOption);
}
rda->cmdSwitch()->setProcessed(i,true);
}
if(rda->cmdSwitch()->key(i)=="--cut-number") {
d_cut_number=rda->cmdSwitch()->value(i).toInt(&ok);
if((!ok)||(d_cut_number>RD_MAX_CUT_NUMBER)||(d_cut_number<1)) {
fprintf(stderr,"wavewidget_test: invalid cut number\n");
exit(RDApplication::ExitInvalidOption);
}
rda->cmdSwitch()->setProcessed(i,true);
}
if(rda->cmdSwitch()->key(i)=="--track-mode") {
if(rda->cmdSwitch()->value(i)=="single") {
d_track_mode=RDWaveWidget::SingleTrack;
track_mode_set=true;
}
if(rda->cmdSwitch()->value(i)=="multi") {
d_track_mode=RDWaveWidget::MultiTrack;
track_mode_set=true;
}
if(!track_mode_set) {
fprintf(stderr,"wavewidget_test: invalid --track-mode argument\n");
exit(RDApplication::ExitInvalidOption);
}
rda->cmdSwitch()->setProcessed(i,true);
}
if(!rda->cmdSwitch()->processed(i)) {
fprintf(stderr,"wavewidget_test: unknown option \"%s\"\"\n",
rda->cmdSwitch()->key(i).toUtf8().constData());
exit(RDApplication::ExitInvalidOption);
}
}
if(d_cart_number==0) {
fprintf(stderr,"wavewidget_test: you must specify a cart number\n");
exit(RDApplication::ExitInvalidOption);
}
if(d_cut_number==-1) {
fprintf(stderr,"wavewidget_test: you must specify a cut number\n");
exit(RDApplication::ExitInvalidOption);
}
if(!track_mode_set) {
fprintf(stderr,"wavewidget_test: you must specify a track mode\n");
exit(RDApplication::ExitInvalidOption);
}
//
// Widget
//
d_wave_widget=new RDWaveWidget(d_track_mode,200,this);
//
// X Shrink Factor
//
d_shrink_factor_group=new QGroupBox(tr("X Shrink Factor"),this);
d_shrink_factor_group->setFont(d_font_engine->labelFont());
d_up_button=
new RDTransportButton(RDTransportButton::Up,d_shrink_factor_group);
connect(d_up_button,SIGNAL(clicked()),this,SLOT(upShrinkData()));
d_down_button=
new RDTransportButton(RDTransportButton::Down,d_shrink_factor_group);
connect(d_down_button,SIGNAL(clicked()),this,SLOT(downShrinkData()));
d_shrink_factor_edit=new QLineEdit(d_shrink_factor_group);
d_shrink_factor_edit->setReadOnly(true);
d_shrink_factor_edit->setText("1");
//
// Audio Gain
//
d_audio_gain_label=new QLabel(tr("Audio Gain")+":",this);
d_audio_gain_label->setFont(d_font_engine->labelFont());
d_audio_gain_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
d_audio_gain_spin=new QSpinBox(this);
d_audio_gain_spin->setRange(0,100);
d_audio_gain_unit=new QLabel(tr("dB")+":",this);
d_audio_gain_unit->setFont(d_font_engine->labelFont());
d_audio_gain_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
connect(d_audio_gain_spin,SIGNAL(valueChanged(int)),
this,SLOT(gainChangedData(int)));
//
// Connect to ripcd(8)
//
connect(rda,SIGNAL(userChanged()),this,SLOT(userData()));
rda->ripc()->
connectHost("localhost",RIPCD_TCP_PORT,rda->config()->password());
setMinimumSize(sizeHint());
setMaximumHeight(sizeHint().height());
}
QSize MainWidget::sizeHint() const
{
return QSize(1000,375);
}
void MainWidget::userData()
{
QString err_msg;
setWindowTitle("wavewidget_test User: "+rda->user()->name());
d_cut=new RDCut(d_cart_number,d_cut_number);
if(!d_cut->exists()) {
fprintf(stderr,"wavewidget_test: no such cart/cut\n");
exit(RDApplication::ExitInvalidCart);
}
if(!d_wave_widget->setCut(&err_msg,d_cart_number,d_cut_number)) {
QMessageBox::critical(this,"wavewidget_test - "+tr("Error"),err_msg);
exit(256);
}
}
void MainWidget::upShrinkData()
{
int x_shrink=d_shrink_factor_edit->text().toInt();
x_shrink=x_shrink*2;
d_shrink_factor_edit->setText(QString().sprintf("%d",x_shrink));
d_wave_widget->setShrinkFactor(x_shrink);
}
void MainWidget::downShrinkData()
{
int x_shrink=d_shrink_factor_edit->text().toInt();
if(x_shrink>1) {
x_shrink=x_shrink/2;
d_shrink_factor_edit->setText(QString().sprintf("%d",x_shrink));
d_wave_widget->setShrinkFactor(x_shrink);
}
}
void MainWidget::gainChangedData(int db)
{
d_wave_widget->setAudioGain((qreal)db);
}
void MainWidget::resizeEvent(QResizeEvent *e)
{
int w=size().width();
int h=size().height();
d_wave_widget->setGeometry(0,0,w,d_wave_widget->sizeHint().height());
d_shrink_factor_group->setGeometry(10,h-150,155,145);
d_up_button->setGeometry(10,25,80,50);
d_down_button->setGeometry(10,80,80,50);
d_shrink_factor_edit->setGeometry(100,25,50,20);
d_audio_gain_label->setGeometry(200,h-120,100,20);
d_audio_gain_spin->setGeometry(305,h-120,50,20);
d_audio_gain_unit->setGeometry(360,h-120,50,20);
}
int main(int argc,char *argv[])
{
QApplication a(argc,argv);
MainWidget *w=new MainWidget();
w->show();
return a.exec();
}

70
tests/wavewidget_test.h Normal file
View File

@@ -0,0 +1,70 @@
// wavewidget_test.h
//
// Test harness for RDWaveWidget
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
// published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#ifndef WAVEWIDGET_TEST_H
#define WAVEWIDGET_TEST_H
#include <QGraphicsView>
#include <QGroupBox>
#include <QLabel>
#include <QLineEdit>
#include <QSpinBox>
#include <QWidget>
#include <rdfontengine.h>
#include <rdtransportbutton.h>
#include <rdwavewidget.h>
#define WAVEWIDGET_TEST_USAGE "--cart-number=<cartnum> --cut-number=<cutnum> --track-mode=single|multi\n"
class MainWidget : public QWidget
{
Q_OBJECT
public:
MainWidget(QWidget *parent=0);
QSize sizeHint() const;
private slots:
void userData();
void upShrinkData();
void downShrinkData();
void gainChangedData(int db);
protected:
void resizeEvent(QResizeEvent *e);
private:
RDWaveWidget *d_wave_widget;
RDCut *d_cut;
unsigned d_cart_number;
int d_cut_number;
RDWaveWidget::TrackMode d_track_mode;
RDFontEngine *d_font_engine;
RDTransportButton *d_up_button;
RDTransportButton *d_down_button;
QLineEdit *d_shrink_factor_edit;
QGroupBox *d_shrink_factor_group;
QLabel *d_audio_gain_label;
QSpinBox *d_audio_gain_spin;
QLabel *d_audio_gain_unit;
};
#endif // WAVEWIDGET_TEST_H