w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-23 20:58:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move the PSKreporter functions in Windows to our built-in code.

Browse Source 
No more need for PSKReporter.dll.
Remove the no-longer-needed "#ifdef WIN32", "#ifdef UNIX" blocks.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3524 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-08-05 15:00:38 +00:00
parent 87ad45188f
commit d8a592af51
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mainwindow.cpp
View File

@ -350,6 +350,7 @@ MainWindow::MainWindow(QSharedMemory *shdmem, QString *thekey, \
ui->decodedTextLabel->setText(t); ui->decodedTextLabel->setText(t);
ui->decodedTextLabel2->setText(t); ui->decodedTextLabel2->setText(t);
/*
#ifdef WIN32 #ifdef WIN32
if(m_pskReporter) { if(m_pskReporter) {
rc=ReporterInitialize(NULL,NULL); rc=ReporterInitialize(NULL,NULL);
@ -364,9 +365,10 @@ MainWindow::MainWindow(QSharedMemory *shdmem, QString *thekey, \
#endif #endif
#ifdef UNIX #ifdef UNIX
*/
psk_Reporter = new PSK_Reporter(this); psk_Reporter = new PSK_Reporter(this);
psk_Reporter->setLocalStation(m_myCall,m_myGrid, m_antDescription[m_band], "WSJT-X r" + rev.mid(6,4) ); psk_Reporter->setLocalStation(m_myCall,m_myGrid, m_antDescription[m_band], "WSJT-X r" + rev.mid(6,4) );
#endif //#endif
m_logBook.init(); m_logBook.init();
@ -813,6 +815,7 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog
ui->bandComboBox->addItems(dlg.m_bandDescription); ui->bandComboBox->addItems(dlg.m_bandDescription);
ui->bandComboBox->setCurrentIndex(m_band); ui->bandComboBox->setCurrentIndex(m_band);
/*
#ifdef WIN32 #ifdef WIN32
if(dlg.m_pskReporter!=m_pskReporter) { if(dlg.m_pskReporter!=m_pskReporter) {
if(dlg.m_pskReporter) { if(dlg.m_pskReporter) {
@ -830,13 +833,14 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog
} }
} }
#endif #endif
*/
m_pskReporter=dlg.m_pskReporter; m_pskReporter=dlg.m_pskReporter;
#ifdef UNIX //#ifdef UNIX
if(m_pskReporter) { if(m_pskReporter) {
psk_Reporter->setLocalStation(m_myCall, m_myGrid, m_antDescription[m_band], "WSJT-X r" + rev.mid(6,4) ); psk_Reporter->setLocalStation(m_myCall, m_myGrid, m_antDescription[m_band], "WSJT-X r" + rev.mid(6,4) );
} }
#endif //#endif
m_After73=dlg.m_After73; m_After73=dlg.m_After73;
@ -1591,6 +1595,7 @@ void MainWindow::readFromStdout() //readFromStdout
wchar_t tremote[256]; wchar_t tremote[256];
remote.toWCharArray(tremote); remote.toWCharArray(tremote);
/*
#ifdef WIN32 #ifdef WIN32
if(m_pskReporterInit and b and !m_diskData and okToPost) { if(m_pskReporterInit and b and !m_diskData and okToPost) {
@ -1613,6 +1618,7 @@ void MainWindow::readFromStdout() //readFromStdout
} }
} }
#else #else
*/
if(m_pskReporter and b and !m_diskData and okToPost) { if(m_pskReporter and b and !m_diskData and okToPost) {
psk_Reporter->setLocalStation(m_myCall, m_myGrid, m_antDescription[m_band], "WSJT-X r" + rev.mid(6,4) ); psk_Reporter->setLocalStation(m_myCall, m_myGrid, m_antDescription[m_band], "WSJT-X r" + rev.mid(6,4) );
QString freq = QString::number(nfreq); QString freq = QString::number(nfreq);
@ -1622,7 +1628,7 @@ void MainWindow::readFromStdout() //readFromStdout
QString::number(QDateTime::currentDateTime().toTime_t())); QString::number(QDateTime::currentDateTime().toTime_t()));
} }
} }
#endif //#endif
} }
} }
} }

2
widegraph.h
View File

@ -83,8 +83,10 @@ private:
Ui::WideGraph *ui; Ui::WideGraph *ui;
}; };
/*
#ifdef WIN32 #ifdef WIN32
extern int set570(double freq_MHz); extern int set570(double freq_MHz);
#endif #endif
*/
#endif // WIDEGRAPH_H #endif // WIDEGRAPH_H