diff --git a/mainwindow.cpp b/mainwindow.cpp index 2c061b77a..02f2a5c59 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -159,6 +159,10 @@ MainWindow::MainWindow(QWidget *parent) : // ui->xThermo->setFillBrush(Qt::green); // ui->yThermo->setFillBrush(Qt::magenta); + xSignalMeter = new SignalMeter(ui->xMeterFrame); + xSignalMeter->resize(50, 160); + ySignalMeter = new SignalMeter(ui->yMeterFrame); + ySignalMeter->resize(50, 160); #ifdef WIN32 while(true) { diff --git a/mainwindow.h b/mainwindow.h index 0b2585dbb..0d218377d 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -9,6 +9,7 @@ #include "getfile.h" #include "soundin.h" #include "soundout.h" +#include "signalmeter.h" #include "commons.h" #include "sleep.h" #include @@ -247,6 +248,10 @@ private: QHash m_worked; + SignalMeter *xSignalMeter; + SignalMeter *ySignalMeter; + + SoundInThread soundInThread; //Instantiate the audio threads SoundOutThread soundOutThread; diff --git a/mainwindow.ui b/mainwindow.ui index 714a66d09..916719897 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -225,21 +225,22 @@ p, li { white-space: pre-wrap; } - - - - 0 - 0 - + + + QFrame::StyledPanel - - - 16777215 - 26 - + + QFrame::Raised - - dB + + + + + + QFrame::StyledPanel + + + QFrame::Raised diff --git a/map65.pro b/map65.pro index b597cb73b..2ccc8374e 100644 --- a/map65.pro +++ b/map65.pro @@ -39,7 +39,7 @@ SOURCES += main.cpp mainwindow.cpp plotter.cpp about.cpp \ soundin.cpp soundout.cpp devsetup.cpp \ widegraph.cpp getfile.cpp messages.cpp bandmap.cpp \ astro.cpp displaytext.cpp getdev.cpp \ - txtune.cpp + txtune.cpp meterwidget.cpp signalmeter.cpp win32 { SOURCES += killbyname.cpp set570.cpp @@ -48,7 +48,7 @@ SOURCES += killbyname.cpp set570.cpp HEADERS += mainwindow.h plotter.h soundin.h soundout.h \ about.h devsetup.h widegraph.h getfile.h messages.h \ bandmap.h commons.h sleep.h astro.h displaytext.h \ - txtune.h + txtune.h meterwidget.h signalmeter.h FORMS += mainwindow.ui about.ui devsetup.ui widegraph.ui \ messages.ui bandmap.ui astro.ui \