w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-25 10:52:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up the IPC between WSJT-X and QMAP. Fix the "QSOs:" listing in ActiveStations window.

Browse Source
This commit is contained in:
Joe Taylor 2023-01-26 10:55:10 -05:00
parent 46fdc79881
commit 29360db01a
4 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qmap/commons.h
View File

@ -84,12 +84,12 @@ extern struct { //This is "common/datcom/..." in Fortran
} datcom2_; } datcom2_;
extern struct { extern struct {
int ndecodes; int ndecodes; //These are flags for inter-process communication
int ncand; int ncand; //between QMAP and WSJT-X
int nQDecoderDone; int nQDecoderDone; //1 for real-time decodes, 2 for data from disk
int nWDecoderBusy; int nWDecoderBusy; //Set to 1 when WSJT-X decoder is busy
int nWTransmitting; int nWTransmitting; //Set to 1 when WSJT-X is transmitting
char result[50][60]; char result[50][60]; //Staging area for QMAP decodes
} decodes_; } decodes_;
} }

10
qmap/mainwindow.cpp
View File

@ -408,8 +408,6 @@ void MainWindow::dataSink(int k)
datcom_.nhsym=ihsym; datcom_.nhsym=ihsym;
QDateTime t = QDateTime::currentDateTimeUtc(); QDateTime t = QDateTime::currentDateTimeUtc();
m_dateTime=t.toString("yymmdd_hhmm"); m_dateTime=t.toString("yymmdd_hhmm");
// qDebug() << "aa" << "Decoder called" << ihsym << ipc_wsjtx[0] << ipc_wsjtx[1]
// << ipc_wsjtx[2] << ipc_wsjtx[3] << ipc_wsjtx[4] ;
decode(); //Start the decoder decode(); //Start the decoder
if(m_saveAll and !m_diskData and m_nTransmitted<10) { if(m_saveAll and !m_diskData and m_nTransmitted<10) {
QString fname=m_saveDir + "/" + t.date().toString("yyMMdd") + "_" + QString fname=m_saveDir + "/" + t.date().toString("yyMMdd") + "_" +
@ -701,7 +699,6 @@ void MainWindow::on_actionDecode_remaining_files_in_directory_triggered()
void MainWindow::diskDat() //diskDat() void MainWindow::diskDat() //diskDat()
{ {
// qDebug() << "aa1" << datcom_.fcenter;
double hsym; double hsym;
//These may be redundant?? //These may be redundant??
m_diskData=true; m_diskData=true;
@ -727,10 +724,11 @@ void MainWindow::decoderFinished() //diskWriteFinished
decodes_.nQDecoderDone=1; decodes_.nQDecoderDone=1;
if(m_diskData) decodes_.nQDecoderDone=2; if(m_diskData) decodes_.nQDecoderDone=2;
mem_qmap.lock(); mem_qmap.lock();
memcpy((char*)ipc_wsjtx, &decodes_, sizeof(decodes_)); decodes_.nWDecoderBusy=ipc_wsjtx[3]; //Prevent overwriting values
decodes_.nWTransmitting=ipc_wsjtx[4]; //written here by WSJT-X
memcpy((char*)ipc_wsjtx, &decodes_, sizeof(decodes_)); //Send decodes and flags to WSJT-X
mem_qmap.unlock(); mem_qmap.unlock();
QString t1; QString t1;
// t1=t1.asprintf(" %3d/%d ",decodes_.ndecodes,decodes_.ncand);
t1=t1.asprintf(" %d ",decodes_.ndecodes); t1=t1.asprintf(" %d ",decodes_.ndecodes);
lab4->setText(t1); lab4->setText(t1);
QDateTime now=QDateTime::currentDateTimeUtc(); QDateTime now=QDateTime::currentDateTimeUtc();
@ -788,7 +786,6 @@ void MainWindow::freezeDecode(int n) //freezeDecode()
datcom_.ntol=m_tol; datcom_.ntol=m_tol;
} }
m_nDoubleClicked++; m_nDoubleClicked++;
// qDebug() << "aa" << m_nDoubleClicked << m_decoderBusy << m_nTransmitted << n;
if(!m_decoderBusy) { if(!m_decoderBusy) {
datcom_.nagain=1; datcom_.nagain=1;
datcom_.newdat=0; datcom_.newdat=0;
@ -845,7 +842,6 @@ void MainWindow::decode() //decode()
datcom_.nfa=nfa; datcom_.nfa=nfa;
datcom_.nfb=nfb; datcom_.nfb=nfb;
// qDebug() << "bbb" << datcom_.fcenter << datcom_.nfa << datcom_.nfb << datcom_.fselected;
datcom_.nfcal=m_fCal; datcom_.nfcal=m_fCal;
datcom_.nfshift=nfshift; datcom_.nfshift=nfshift;
datcom_.mcall3=0; datcom_.mcall3=0;

1
widgets/activeStations.cpp
View File

@ -131,6 +131,7 @@ void ActiveStations::setRate(int n)
void ActiveStations::setScore(int n) void ActiveStations::setScore(int n)
{ {
qDebug() << "FF" << n;
ui->score->setText(QLocale(QLocale::English).toString(n)); ui->score->setText(QLocale(QLocale::English).toString(n));
} }

32
widgets/mainwindow.cpp
View File

@ -903,7 +903,10 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
ui->lh_decodes_headings_label->setText(t); ui->lh_decodes_headings_label->setText(t);
ui->rh_decodes_headings_label->setText(t); ui->rh_decodes_headings_label->setText(t);
readSettings(); //Restore user's setup parameters readSettings(); //Restore user's setup parameters
if(m_mode=="Q65") read_log(); if(m_mode=="Q65") {
m_score=0;
read_log();
}
m_audioThread.start (m_audioThreadPriority); m_audioThread.start (m_audioThreadPriority);
#ifdef WIN32 #ifdef WIN32
@ -2940,6 +2943,7 @@ void MainWindow::on_actionActiveStations_triggered()
connect(m_ActiveStationsWidget.data(), SIGNAL(callSandP(int)),this,SLOT(callSandP2(int))); connect(m_ActiveStationsWidget.data(), SIGNAL(callSandP(int)),this,SLOT(callSandP2(int)));
connect(m_ActiveStationsWidget.data(), SIGNAL(activeStationsDisplay()),this,SLOT(ARRL_Digi_Display())); connect(m_ActiveStationsWidget.data(), SIGNAL(activeStationsDisplay()),this,SLOT(ARRL_Digi_Display()));
m_ActiveStationsWidget->setScore(m_score); m_ActiveStationsWidget->setScore(m_score);
if(m_mode=="Q65") m_ActiveStationsWidget->setRate(m_score);
} }
void MainWindow::on_actionOpen_triggered() //Open File void MainWindow::on_actionOpen_triggered() //Open File
@ -3554,7 +3558,6 @@ void MainWindow::read_log()
{ {
static QFile f {QDir {QStandardPaths::writableLocation (QStandardPaths::DataLocation)}.absoluteFilePath ("wsjtx.log")}; static QFile f {QDir {QStandardPaths::writableLocation (QStandardPaths::DataLocation)}.absoluteFilePath ("wsjtx.log")};
f.open(QIODevice::ReadOnly); f.open(QIODevice::ReadOnly);
m_score=0;
if(f.isOpen()) { if(f.isOpen()) {
QTextStream in(&f); QTextStream in(&f);
QString line,callsign; QString line,callsign;
@ -3566,10 +3569,13 @@ void MainWindow::read_log()
if(n>0) callsign=callsign.left(n); if(n>0) callsign=callsign.left(n);
m_EMEworked[callsign]=true; m_EMEworked[callsign]=true;
m_score++; m_score++;
qDebug() << "aa" << m_score << callsign;
} }
f.close(); f.close();
} }
if(m_ActiveStationsWidget!=NULL) {
m_ActiveStationsWidget->setScore(m_score);
if(m_mode=="Q65") m_ActiveStationsWidget->setRate(m_score);
}
} }
void MainWindow::ARRL_Digi_Update(DecodedText dt) void MainWindow::ARRL_Digi_Update(DecodedText dt)
@ -4859,7 +4865,7 @@ void MainWindow::guiUpdate()
n=0; n=0;
if(m_transmitting) n=1; if(m_transmitting) n=1;
ipc_qmap[4]=n; ipc_qmap[4]=n;
if(ipc_qmap[0] > m_fetched) { //ndecodes if(ipc_qmap[0] > 0) { //ndecodes
memcpy(&qmapcom, (char*)ipc_qmap, sizeof(qmapcom)); //Fetch the new decode(s) memcpy(&qmapcom, (char*)ipc_qmap, sizeof(qmapcom)); //Fetch the new decode(s)
readWidebandDecodes(); readWidebandDecodes();
} }
@ -4868,8 +4874,8 @@ void MainWindow::guiUpdate()
//Once per second (onesec) //Once per second (onesec)
if(nsec != m_sec0) { if(nsec != m_sec0) {
qDebug() << "AAA" << nsec << ipc_qmap[0] << ipc_qmap[1] << ipc_qmap[2] // qDebug() << "AAA" << nsec%60 << ipc_qmap[0] << ipc_qmap[1] << ipc_qmap[2]
<< ipc_qmap[3] << ipc_qmap[4] << m_fetched; // << ipc_qmap[3] << ipc_qmap[4] << m_fetched;
if(m_mode=="FST4") chk_FST4_freq_range(); if(m_mode=="FST4") chk_FST4_freq_range();
m_currentBand=m_config.bands()->find(m_freqNominal); m_currentBand=m_config.bands()->find(m_freqNominal);
@ -6562,7 +6568,7 @@ void MainWindow::acceptQSO (QDateTime const& QSO_date_off, QString const& call,
if(m_mode=="Q65") { if(m_mode=="Q65") {
m_score++; m_score++;
m_EMEworked[call]=true; m_EMEworked[call]=true;
qDebug() << "bb" << m_score << call; m_ActiveStationsWidget->setRate(m_score);
} else { } else {
QString band=m_config.bands()->find(dial_freq); QString band=m_config.bands()->find(dial_freq);
activeWorked(call,band); activeWorked(call,band);
@ -6573,8 +6579,8 @@ void MainWindow::acceptQSO (QDateTime const& QSO_date_off, QString const& call,
al.band=band; al.band=band;
al.points=points; al.points=points;
m_arrl_log.append(al); m_arrl_log.append(al);
updateRate();
} }
updateRate();
} }
m_xSent.clear (); m_xSent.clear ();
@ -7535,7 +7541,10 @@ void MainWindow::on_reset_cabrillo_log_action_triggered ()
m_activeCall.clear(); //Erase the QMap of active calls m_activeCall.clear(); //Erase the QMap of active calls
m_EMECall.clear(); //ditto for EME calls m_EMECall.clear(); //ditto for EME calls
m_score=0; m_score=0;
if (m_ActiveStationsWidget) m_ActiveStationsWidget->setScore(0); if (m_ActiveStationsWidget) {
m_ActiveStationsWidget->setScore(0);
if(m_mode=="Q65") m_ActiveStationsWidget->setRate(0);
}
} }
} }
@ -9260,7 +9269,6 @@ void MainWindow::write_transmit_entry (QString const& file_name)
void MainWindow::readWidebandDecodes() void MainWindow::readWidebandDecodes()
{ {
qDebug() << "dd" << m_fetched << qmapcom.ndecodes;
if(m_ActiveStationsWidget==NULL) return; if(m_ActiveStationsWidget==NULL) return;
int nhr=0; int nhr=0;
@ -9321,8 +9329,6 @@ void MainWindow::readWidebandDecodes()
if(age<=maxAge) { if(age<=maxAge) {
dxcall=(i.key()+" ").left(8); dxcall=(i.key()+" ").left(8);
dxgrid4=(i->grid4+"... ").left(4); dxgrid4=(i->grid4+"... ").left(4);
// if(i->worked) {
qDebug() << "cc" << dxcall.trimmed();
if(m_EMEworked[dxcall.trimmed()]) { if(m_EMEworked[dxcall.trimmed()]) {
t1=t1.asprintf("%7.3f %5.1f %+03d %8s %4s %3d %3d\n",i->frx,i->fsked,snr,dxcall.toLatin1().constData(), t1=t1.asprintf("%7.3f %5.1f %+03d %8s %4s %3d %3d\n",i->frx,i->fsked,snr,dxcall.toLatin1().constData(),
dxgrid4.toLatin1().constData(),odd,age); dxgrid4.toLatin1().constData(),odd,age);
@ -9355,7 +9361,7 @@ void MainWindow::readWidebandDecodes()
m_ActiveStationsWidget->displayRecentStations(m_mode,t); m_ActiveStationsWidget->displayRecentStations(m_mode,t);
m_ActiveStationsWidget->setClickOK(true); m_ActiveStationsWidget->setClickOK(true);
} }
if(ipc_qmap[2]==1) { if(ipc_qmap[2]!=0) {
m_fetched=0; m_fetched=0;
ipc_qmap[0]=0; ipc_qmap[0]=0;
ipc_qmap[2]=0; ipc_qmap[2]=0;