w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-31 16:38:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Q65W waterfall should not scroll if WSJT-X is transmitting.

Browse Source
This commit is contained in:
Joe Taylor 2022-12-15 15:26:48 -05:00
parent e4dd4b98a8
commit 5f94a115f7
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
q65w/commons.h
View File

@ -86,6 +86,8 @@ extern struct { //This is "common/datcom/..." in Fortran
extern struct { extern struct {
int ndecodes; int ndecodes;
int ncand; int ncand;
int nQDecoderBusy;
int nWTransmitting;
char result[50][60]; char result[50][60];
} decodes_; } decodes_;

7
q65w/mainwindow.cpp
View File

@ -382,8 +382,9 @@ void MainWindow::dataSink(int k)
); );
xSignalMeter->setValue(px); // Update the signal meters xSignalMeter->setValue(px); // Update the signal meters
if(m_monitoring || m_diskData) { //Suppress scrolling if WSJT-X is transmitting
m_wide_graph_window->dataSink2(s,nkhz,ihsym,m_diskData,lstrong); if((m_monitoring and ipc_wsjtx[4] != 1) or m_diskData) {
m_wide_graph_window->dataSink2(s,nkhz,ihsym,m_diskData,lstrong);
} }
//Average over specified number of spectra //Average over specified number of spectra
@ -963,7 +964,7 @@ void MainWindow::guiUpdate()
} }
if(nsec != m_sec0) { //Once per second if(nsec != m_sec0) { //Once per second
// qDebug() << "AAA" << nsec%60 << ipc_wsjtx[0] << ipc_wsjtx[1]; // qDebug() << "AAA" << nsec%60 << ipc_wsjtx[3] << ipc_wsjtx[4]<< m_monitoring;
if(m_pctZap>30.0) { if(m_pctZap>30.0) {
lab4->setStyleSheet("QLabel{background-color: #ff0000}"); lab4->setStyleSheet("QLabel{background-color: #ff0000}");

22
widgets/mainwindow.cpp
View File

@ -473,7 +473,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
} }
ipc_q65w = (int*)mem_q65w.data(); ipc_q65w = (int*)mem_q65w.data();
mem_q65w.lock(); mem_q65w.lock();
memset(ipc_q65w,0,memSize); //Zero all of shared memory memset(ipc_q65w,0,memSize); //Zero all of Q65W shared memory
mem_q65w.unlock(); mem_q65w.unlock();
// Closedown. // Closedown.
@ -1134,6 +1134,7 @@ MainWindow::~MainWindow()
m_audioThread.quit (); m_audioThread.quit ();
m_audioThread.wait (); m_audioThread.wait ();
remove_child_from_event_filter (this); remove_child_from_event_filter (this);
memset(ipc_q65w,0,4096); //Zero all of Q65W shared memory
} }
//-------------------------------------------------------- writeSettings() //-------------------------------------------------------- writeSettings()
@ -3685,7 +3686,6 @@ void MainWindow::callSandP2(int n)
m_deGrid=w[3]; m_deGrid=w[3];
m_txFirst=(w[4]=="0"); m_txFirst=(w[4]=="0");
// ui->TxFreqSpinBox->setValue(1500); // ui->TxFreqSpinBox->setValue(1500);
// qDebug() << "aa" << n << w;
} else { } else {
m_deCall=w[0]; m_deCall=w[0];
m_deGrid=w[1]; m_deGrid=w[1];
@ -4815,12 +4815,18 @@ void MainWindow::guiUpdate()
} }
if(m_mode=="Echo" and !m_monitoring and !m_auto and !m_diskData) m_echoRunning=false; if(m_mode=="Echo" and !m_monitoring and !m_auto and !m_diskData) m_echoRunning=false;
mem_q65w.lock(); if(m_mode=="Q65") {
if(m_mode=="Q65" and (ipc_q65w[0] > m_fetched)) { //ndecodes mem_q65w.lock();
memcpy(&q65wcom, (char*)ipc_q65w, sizeof(q65wcom)); int n=0;
mem_q65w.unlock(); if(m_decoderBusy) n=1;
readWidebandDecodes(); ipc_q65w[3]=n;
} else { n=0;
if(m_transmitting) n=1;
ipc_q65w[4]=n;
if(ipc_q65w[0] > m_fetched) { //ndecodes
memcpy(&q65wcom, (char*)ipc_q65w, sizeof(q65wcom));
readWidebandDecodes();
}
mem_q65w.unlock(); mem_q65w.unlock();
} }