w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-02-03 09:44:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Function "msgtype" needs work to compile in Linux.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2742 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2012-11-16 16:08:33 +00:00
parent 09f26b6fff
commit e5a97a346d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mainwindow.cpp
View File

@ -72,7 +72,6 @@ MainWindow::MainWindow(QWidget *parent) :
SLOT(selectCall2(bool))); SLOT(selectCall2(bool)));
setWindowTitle(Program_Title_Version); setWindowTitle(Program_Title_Version);
connect(&soundInThread, SIGNAL(readyForFFT(int)), connect(&soundInThread, SIGNAL(readyForFFT(int)),
this, SLOT(dataSink(int))); this, SLOT(dataSink(int)));
connect(&soundInThread, SIGNAL(error(QString)), this, connect(&soundInThread, SIGNAL(error(QString)), this,
@ -84,7 +83,6 @@ MainWindow::MainWindow(QWidget *parent) :
QTimer *guiTimer = new QTimer(this); QTimer *guiTimer = new QTimer(this);
connect(guiTimer, SIGNAL(timeout()), this, SLOT(guiUpdate())); connect(guiTimer, SIGNAL(timeout()), this, SLOT(guiUpdate()));
guiTimer->start(100); //Don't change the 100 ms! guiTimer->start(100); //Don't change the 100 ms!
m_auto=false; m_auto=false;
m_waterfallAvg = 1; m_waterfallAvg = 1;
m_txFirst=false; m_txFirst=false;
@ -117,7 +115,6 @@ MainWindow::MainWindow(QWidget *parent) :
decodeBusy(false); decodeBusy(false);
ui->xThermo->setFillBrush(Qt::green); ui->xThermo->setFillBrush(Qt::green);
PaError paerr=Pa_Initialize(); //Initialize Portaudio PaError paerr=Pa_Initialize(); //Initialize Portaudio
if(paerr!=paNoError) { if(paerr!=paNoError) {
msgBox("Unable to initialize PortAudio."); msgBox("Unable to initialize PortAudio.");
@ -132,7 +129,6 @@ MainWindow::MainWindow(QWidget *parent) :
m_pbAutoOn_style="QPushButton{background-color: red; \ m_pbAutoOn_style="QPushButton{background-color: red; \
border-style: outset; border-width: 1px; border-radius: 5px; \ border-style: outset; border-width: 1px; border-radius: 5px; \
border-color: black; min-width: 5em; padding: 3px;}"; border-color: black; min-width: 5em; padding: 3px;}";
genStdMsgs("-30"); genStdMsgs("-30");
on_actionWide_Waterfall_triggered(); //### on_actionWide_Waterfall_triggered(); //###
if(m_mode=="JT9-1") on_actionJT9_1_triggered(); if(m_mode=="JT9-1") on_actionJT9_1_triggered();
@ -140,7 +136,6 @@ MainWindow::MainWindow(QWidget *parent) :
if(m_mode=="JT9-5") on_actionJT9_5_triggered(); if(m_mode=="JT9-5") on_actionJT9_5_triggered();
if(m_mode=="JT9-10") on_actionJT9_10_triggered(); if(m_mode=="JT9-10") on_actionJT9_10_triggered();
if(m_mode=="JT9-30") on_actionJT9_30_triggered(); if(m_mode=="JT9-30") on_actionJT9_30_triggered();
future1 = new QFuture<void>; future1 = new QFuture<void>;
watcher1 = new QFutureWatcher<void>; watcher1 = new QFutureWatcher<void>;
connect(watcher1, SIGNAL(finished()),this,SLOT(diskDat())); connect(watcher1, SIGNAL(finished()),this,SLOT(diskDat()));
@ -1184,6 +1179,7 @@ void MainWindow::genStdMsgs(QString rpt) //genStdMsgs()
t=t0 + "73"; t=t0 + "73";
msgtype(t, ui->tx5); msgtype(t, ui->tx5);
} }
t="CQ " + m_myCall + " " + m_myGrid.mid(0,4); t="CQ " + m_myCall + " " + m_myGrid.mid(0,4);
msgtype(t, ui->tx6); msgtype(t, ui->tx6);
m_ntx=1; m_ntx=1;
@ -1314,6 +1310,8 @@ void MainWindow::on_addButton_clicked() //Add button
void MainWindow::msgtype(QString t, QLineEdit* tx) //msgtype() void MainWindow::msgtype(QString t, QLineEdit* tx) //msgtype()
{ {
#ifdef WIN32
// Needs work for compiling in Linux
char message[23]; char message[23];
char msgsent[23]; char msgsent[23];
int len1=22; int len1=22;
@ -1346,6 +1344,7 @@ void MainWindow::msgtype(QString t, QLineEdit* tx) //msgtype()
} else { } else {
tx->setText(t); tx->setText(t);
} }
#endif
} }
void MainWindow::on_tx1_editingFinished() //tx1 edited void MainWindow::on_tx1_editingFinished() //tx1 edited