w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-08-22 15:32:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use PY2SDR signalMeters to replace Qwt Thermos.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@3824 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2014-03-03 16:44:14 +00:00
parent 4bda372088
commit 0d842cac29
4 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mainwindow.cpp
View File

@ -159,6 +159,10 @@ MainWindow::MainWindow(QWidget *parent) :
// ui->xThermo->setFillBrush(Qt::green); // ui->xThermo->setFillBrush(Qt::green);
// ui->yThermo->setFillBrush(Qt::magenta); // 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 #ifdef WIN32
while(true) { while(true) {

5
mainwindow.h
View File

@ -9,6 +9,7 @@
#include "getfile.h" #include "getfile.h"
#include "soundin.h" #include "soundin.h"
#include "soundout.h" #include "soundout.h"
#include "signalmeter.h"
#include "commons.h" #include "commons.h"
#include "sleep.h" #include "sleep.h"
#include <QtConcurrent/QtConcurrent> #include <QtConcurrent/QtConcurrent>
@ -247,6 +248,10 @@ private:
QHash<QString,bool> m_worked; QHash<QString,bool> m_worked;
SignalMeter *xSignalMeter;
SignalMeter *ySignalMeter;
SoundInThread soundInThread; //Instantiate the audio threads SoundInThread soundInThread; //Instantiate the audio threads
SoundOutThread soundOutThread; SoundOutThread soundOutThread;

27
mainwindow.ui
View File

@ -225,21 +225,22 @@ p, li { white-space: pre-wrap; }
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_5"> <layout class="QHBoxLayout" name="horizontalLayout_5">
<item> <item>
<widget class="QLabel" name="label"> <widget class="QFrame" name="xMeterFrame">
<property name="sizePolicy"> <property name="frameShape">
<sizepolicy hsizetype="Fixed" vsizetype="Minimum"> <enum>QFrame::StyledPanel</enum>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="maximumSize"> <property name="frameShadow">
<size> <enum>QFrame::Raised</enum>
<width>16777215</width>
<height>26</height>
</size>
</property> </property>
<property name="text"> </widget>
<string>dB</string> </item>
<item>
<widget class="QFrame" name="yMeterFrame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property> </property>
</widget> </widget>
</item> </item>

4
map65.pro
View File

@ -39,7 +39,7 @@ SOURCES += main.cpp mainwindow.cpp plotter.cpp about.cpp \
soundin.cpp soundout.cpp devsetup.cpp \ soundin.cpp soundout.cpp devsetup.cpp \
widegraph.cpp getfile.cpp messages.cpp bandmap.cpp \ widegraph.cpp getfile.cpp messages.cpp bandmap.cpp \
astro.cpp displaytext.cpp getdev.cpp \ astro.cpp displaytext.cpp getdev.cpp \
txtune.cpp txtune.cpp meterwidget.cpp signalmeter.cpp
win32 { win32 {
SOURCES += killbyname.cpp set570.cpp SOURCES += killbyname.cpp set570.cpp
@ -48,7 +48,7 @@ SOURCES += killbyname.cpp set570.cpp
HEADERS += mainwindow.h plotter.h soundin.h soundout.h \ HEADERS += mainwindow.h plotter.h soundin.h soundout.h \
about.h devsetup.h widegraph.h getfile.h messages.h \ about.h devsetup.h widegraph.h getfile.h messages.h \
bandmap.h commons.h sleep.h astro.h displaytext.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 \ FORMS += mainwindow.ui about.ui devsetup.ui widegraph.ui \
messages.ui bandmap.ui astro.ui \ messages.ui bandmap.ui astro.ui \