More progress toward JT8 mode.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2599 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2012-09-26 15:20:43 +00:00
parent 1b24a7188d
commit 274e49fb21
7 changed files with 26 additions and 188 deletions

View File

@ -4,14 +4,14 @@
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
void getfile(QString fname, bool xpol, int dbDgrd) void getfile(QString fname, int ntrperiod)
{ {
char name[80]; char name[80];
strcpy(name,fname.toAscii()); strcpy(name,fname.toAscii());
FILE* fp=fopen(name,"rb"); FILE* fp=fopen(name,"rb");
int npts=30*48000; int npts=ntrperiod*12000;
memset(jt8com_.d2,0,2*npts); memset(jt8com_.d2,0,2*npts);
if(fp != NULL) { if(fp != NULL) {
@ -19,10 +19,11 @@ void getfile(QString fname, bool xpol, int dbDgrd)
fread(jt8com_.d2,1,44,fp); fread(jt8com_.d2,1,44,fp);
int nrd=fread(jt8com_.d2,2,npts,fp); int nrd=fread(jt8com_.d2,2,npts,fp);
fclose(fp); fclose(fp);
for(int i=0; i<npts; i++) jt8com_.d2[i]/=100;
} }
} }
void savewav(QString fname) void savewav(QString fname, int ntrperiod)
{ {
struct { struct {
char ariff[4]; char ariff[4];
@ -40,7 +41,7 @@ void savewav(QString fname)
int ndata; int ndata;
} hdr; } hdr;
int npts=30*48000; int npts=ntrperiod*12000;
// qint16* buf=(qint16*)malloc(2*npts); // qint16* buf=(qint16*)malloc(2*npts);
char name[80]; char name[80];
strcpy(name,fname.toAscii()); strcpy(name,fname.toAscii());
@ -64,8 +65,8 @@ void savewav(QString fname)
hdr.lenfmt=16; hdr.lenfmt=16;
hdr.nfmt2=1; hdr.nfmt2=1;
hdr.nchan2=1; hdr.nchan2=1;
hdr.nsamrate=48000; hdr.nsamrate=12000;
hdr.nbytesec=2*48000; hdr.nbytesec=2*12000;
hdr.nbytesam2=2; hdr.nbytesam2=2;
hdr.nbitsam2=16; hdr.nbitsam2=16;
hdr.adata[0]='d'; hdr.adata[0]='d';

View File

@ -5,8 +5,8 @@
#include <QDebug> #include <QDebug>
#include "commons.h" #include "commons.h"
void getfile(QString fname, bool xpol, int dbDgrd); void getfile(QString fname, int ntrperiod);
void savetf2(QString fname); void savetf2(QString fname, int ntrperiod);
float gran(); float gran();
#endif // GETFILE_H #endif // GETFILE_H

View File

@ -69,17 +69,17 @@ subroutine symspecx(k,nsps,ndiskdat,nb,nbslider,pxdb,s,nkhz,ihsym, &
nzh=min(nint(500.0/df),2200) nzh=min(nint(500.0/df),2200)
nz=2*nzh nz=2*nzh
i0=nint(1500.0/df) - nzh i0=nint(1500.0/df) - nzh
! rewind 71 rewind 71
do i=1,nz do i=1,nz
sx=real(cx(i0+i))**2 + aimag(cx(i0+i))**2 sx=real(cx(i0+i))**2 + aimag(cx(i0+i))**2
sx=1.e-5*sx sx=1.e-8*sx
s(i)=sx s(i)=sx
savg(i)=savg(i) + sx savg(i)=savg(i) + sx
if(ihsym.le.184) ss(ihsym,i)=sx if(ihsym.le.184) ss(ihsym,i)=sx
! write(71,3001) (i-1)*df,savg(i) write(71,3001) (i0+i-1)*df,savg(i),db(savg(i))
!3001 format(f12.6,e12.3) 3001 format(f12.6,2f12.3)
enddo enddo
! flush(71) flush(71)
nkhz=100 nkhz=100

View File

@ -102,7 +102,6 @@ MainWindow::MainWindow(QWidget *parent) :
m_loopall=false; m_loopall=false;
m_startAnother=false; m_startAnother=false;
m_saveAll=false; m_saveAll=false;
m_onlyEME=false;
m_sec0=-1; m_sec0=-1;
m_palette="CuteSDR"; m_palette="CuteSDR";
m_RxLog=1; //Write Date and Time to RxLog m_RxLog=1; //Write Date and Time to RxLog
@ -110,7 +109,6 @@ MainWindow::MainWindow(QWidget *parent) :
m_NB=false; m_NB=false;
m_mode="JT8-1"; m_mode="JT8-1";
m_TRperiod=60; m_TRperiod=60;
m_colors="000066ff0000ffff00969696646464";
ui->xThermo->setFillBrush(Qt::green); ui->xThermo->setFillBrush(Qt::green);
@ -168,7 +166,6 @@ MainWindow::MainWindow(QWidget *parent) :
if(line.length()<=0) break; if(line.length()<=0) break;
t=line.mid(18,12); t=line.mid(18,12);
callsign=t.mid(0,t.indexOf(",")); callsign=t.mid(0,t.indexOf(","));
m_worked[callsign]=true;
} }
f.close(); f.close();
@ -221,28 +218,12 @@ void MainWindow::writeSettings()
settings.setValue("MyGrid",m_myGrid); settings.setValue("MyGrid",m_myGrid);
settings.setValue("IDint",m_idInt); settings.setValue("IDint",m_idInt);
settings.setValue("PTTport",m_pttPort); settings.setValue("PTTport",m_pttPort);
settings.setValue("Xpol",m_xpol);
settings.setValue("XpolX",m_xpolx);
settings.setValue("SaveDir",m_saveDir); settings.setValue("SaveDir",m_saveDir);
settings.setValue("AzElDir",m_azelDir);
settings.setValue("DXCCpfx",m_dxccPfx); settings.setValue("DXCCpfx",m_dxccPfx);
settings.setValue("Timeout",m_timeout);
settings.setValue("IQamp",m_IQamp);
settings.setValue("IQphase",m_IQphase);
settings.setValue("ApplyIQcal",m_applyIQcal);
settings.setValue("dPhi",m_dPhi);
settings.setValue("Fcal",m_fCal);
settings.setValue("Fadd",m_fAdd);
settings.setValue("NetworkInput", m_network);
settings.setValue("FSam96000", m_fs96000);
settings.setValue("SoundInIndex",m_nDevIn); settings.setValue("SoundInIndex",m_nDevIn);
settings.setValue("paInDevice",m_paInDevice); settings.setValue("paInDevice",m_paInDevice);
settings.setValue("SoundOutIndex",m_nDevOut); settings.setValue("SoundOutIndex",m_nDevOut);
settings.setValue("paOutDevice",m_paOutDevice); settings.setValue("paOutDevice",m_paOutDevice);
settings.setValue("IQswap",m_IQswap);
settings.setValue("Plus10dB",m_10db);
settings.setValue("InitIQplus",m_initIQplus);
settings.setValue("UDPport",m_udpPort);
settings.setValue("PaletteCuteSDR",ui->actionCuteSDR->isChecked()); settings.setValue("PaletteCuteSDR",ui->actionCuteSDR->isChecked());
settings.setValue("PaletteLinrad",ui->actionLinrad->isChecked()); settings.setValue("PaletteLinrad",ui->actionLinrad->isChecked());
settings.setValue("PaletteAFMHot",ui->actionAFMHot->isChecked()); settings.setValue("PaletteAFMHot",ui->actionAFMHot->isChecked());
@ -251,17 +232,9 @@ void MainWindow::writeSettings()
settings.setValue("SaveNone",ui->actionNone->isChecked()); settings.setValue("SaveNone",ui->actionNone->isChecked());
settings.setValue("SaveAll",ui->actionSave_all->isChecked()); settings.setValue("SaveAll",ui->actionSave_all->isChecked());
settings.setValue("NDepth",m_ndepth); settings.setValue("NDepth",m_ndepth);
settings.setValue("NEME",m_onlyEME);
settings.setValue("KB8RQ",m_kb8rq); settings.setValue("KB8RQ",m_kb8rq);
settings.setValue("NB",m_NB); settings.setValue("NB",m_NB);
settings.setValue("NBslider",m_NBslider); settings.setValue("NBslider",m_NBslider);
settings.setValue("GainX",(double)m_gainx);
settings.setValue("GainY",(double)m_gainy);
settings.setValue("PhaseX",(double)m_phasex);
settings.setValue("PhaseY",(double)m_phasey);
settings.setValue("Mult570",m_mult570);
settings.setValue("Cal570",m_cal570);
settings.setValue("Colors",m_colors);
settings.endGroup(); settings.endGroup();
} }
@ -309,7 +282,6 @@ void MainWindow::readSettings()
ui->NBslider->setValue(m_NBslider); ui->NBslider->setValue(m_NBslider);
m_saveAll=ui->actionSave_all->isChecked(); m_saveAll=ui->actionSave_all->isChecked();
m_ndepth=settings.value("NDepth",0).toInt(); m_ndepth=settings.value("NDepth",0).toInt();
m_onlyEME=settings.value("NEME",false).toBool();
ui->actionF4_sets_Tx6->setChecked(m_kb8rq); ui->actionF4_sets_Tx6->setChecked(m_kb8rq);
settings.endGroup(); settings.endGroup();
@ -362,17 +334,6 @@ void MainWindow::dataSink(int k)
g_pWideGraph->dataSink2(s,nkhz,ihsym,m_diskData,lstrong); g_pWideGraph->dataSink2(s,nkhz,ihsym,m_diskData,lstrong);
} }
if(nadj == 10) {
if(m_xpol) {
t.sprintf("Amp: %6.4f %6.4f Phase: %6.4f %6.4f",
m_gainx,m_gainy,m_phasex,m_phasey);
} else {
t.sprintf("Amp: %6.4f Phase: %6.4f",m_gainx,m_phasex);
}
ui->decodedTextBrowser->append(t);
m_adjustIQ=0;
}
//Average over specified number of spectra //Average over specified number of spectra
if (n==0) { if (n==0) {
for (int i=0; i<NFFT; i++) for (int i=0; i<NFFT; i++)
@ -408,7 +369,7 @@ void MainWindow::dataSink(int k)
if(m_saveAll and !m_diskData) { if(m_saveAll and !m_diskData) {
QString fname=m_saveDir + "/" + t.date().toString("yyMMdd") + "_" + QString fname=m_saveDir + "/" + t.date().toString("yyMMdd") + "_" +
t.time().toString("hhmm") + ".wav"; t.time().toString("hhmm") + ".wav";
*future2 = QtConcurrent::run(savewav, fname); *future2 = QtConcurrent::run(savewav, fname, m_TRperiod);
watcher2->setFuture(*future2); watcher2->setFuture(*future2);
} }
} }
@ -429,7 +390,6 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog
dlg.m_idInt=m_idInt; dlg.m_idInt=m_idInt;
dlg.m_pttPort=m_pttPort; dlg.m_pttPort=m_pttPort;
dlg.m_saveDir=m_saveDir; dlg.m_saveDir=m_saveDir;
dlg.m_azelDir=m_azelDir;
dlg.m_dxccPfx=m_dxccPfx; dlg.m_dxccPfx=m_dxccPfx;
dlg.m_nDevIn=m_nDevIn; dlg.m_nDevIn=m_nDevIn;
dlg.m_nDevOut=m_nDevOut; dlg.m_nDevOut=m_nDevOut;
@ -703,8 +663,7 @@ void MainWindow::on_actionOpen_triggered() //Open File
if(fname != "") { if(fname != "") {
m_path=fname; m_path=fname;
int i; int i;
i=fname.indexOf(".iq") - 11; i=fname.indexOf(".wav") - 11;
if(m_xpol) i=fname.indexOf(".tf2") - 11;
if(i>=0) { if(i>=0) {
lab1->setStyleSheet("QLabel{background-color: #66ff66}"); lab1->setStyleSheet("QLabel{background-color: #66ff66}");
lab1->setText(" " + fname.mid(i,15) + " "); lab1->setText(" " + fname.mid(i,15) + " ");
@ -712,7 +671,7 @@ void MainWindow::on_actionOpen_triggered() //Open File
on_stopButton_clicked(); on_stopButton_clicked();
m_diskData=true; m_diskData=true;
int dbDgrd=0; int dbDgrd=0;
*future1 = QtConcurrent::run(getfile, fname, m_xpol, dbDgrd); *future1 = QtConcurrent::run(getfile, fname, m_TRperiod);
watcher1->setFuture(*future1); watcher1->setFuture(*future1);
} }
} }
@ -739,7 +698,7 @@ void MainWindow::on_actionOpen_next_in_directory_triggered() //Open Next
m_diskData=true; m_diskData=true;
int dbDgrd=0; int dbDgrd=0;
if(m_myCall=="K1JT" and m_idInt<0) dbDgrd=m_idInt; if(m_myCall=="K1JT" and m_idInt<0) dbDgrd=m_idInt;
*future1 = QtConcurrent::run(getfile, fname, m_xpol, dbDgrd); *future1 = QtConcurrent::run(getfile, fname, m_TRperiod);
watcher1->setFuture(*future1); watcher1->setFuture(*future1);
return; return;
} }
@ -754,13 +713,10 @@ void MainWindow::on_actionDecode_remaining_files_in_directory_triggered()
void MainWindow::diskDat() //diskDat() void MainWindow::diskDat() //diskDat()
{ {
int kstep=2048; int kstep=m_nsps/2;
int nsteps;
m_diskData=true; m_diskData=true;
nsteps=29.8*48000/kstep; for(int n=1; n<=184; n++) { // Do the half-symbol FFTs
for(int n=1; n<nsteps; n++) { // Do the half-symbol FFTs
int k=(n+1)*kstep; int k=(n+1)*kstep;
dataSink(k); dataSink(k);
if(n%10 == 0) qApp->processEvents(); //Keep the GUI responsive if(n%10 == 0) qApp->processEvents(); //Keep the GUI responsive
@ -803,11 +759,6 @@ void MainWindow::on_actionF4_sets_Tx6_triggered() //F4 sets Tx6
m_kb8rq = !m_kb8rq; m_kb8rq = !m_kb8rq;
} }
void MainWindow::on_actionOnly_EME_calls_triggered() //EME calls only
{
m_onlyEME = ui->actionOnly_EME_calls->isChecked();
}
void MainWindow::on_actionNo_shorthands_if_Tx1_triggered() void MainWindow::on_actionNo_shorthands_if_Tx1_triggered()
{ {
stub(); stub();
@ -1119,9 +1070,6 @@ void MainWindow::selectCall2(bool ctrl) //selectCall2
//doubleClickOnCall //doubleClickOnCall
void MainWindow::doubleClickOnCall(QString hiscall, bool ctrl) void MainWindow::doubleClickOnCall(QString hiscall, bool ctrl)
{ {
if(m_worked[hiscall]) {
msgBox("Possible dupe: " + hiscall + " already in log.");
}
ui->dxCallEntry->setText(hiscall); ui->dxCallEntry->setText(hiscall);
QString t = ui->decodedTextBrowser->toPlainText(); //Full contents QString t = ui->decodedTextBrowser->toPlainText(); //Full contents
int i2=ui->decodedTextBrowser->textCursor().position(); int i2=ui->decodedTextBrowser->textCursor().position();
@ -1216,78 +1164,6 @@ void MainWindow::on_lookupButton_clicked() //Lookup button
void MainWindow::on_addButton_clicked() //Add button void MainWindow::on_addButton_clicked() //Add button
{ {
if(ui->dxGridEntry->text()=="") {
msgBox("Please enter a valid grid locator.");
return;
}
m_call3Modified=false;
QString hiscall=ui->dxCallEntry->text().toUpper().trimmed();
QString hisgrid=ui->dxGridEntry->text().trimmed();
QString newEntry=hiscall + "," + hisgrid;
int ret = QMessageBox::warning(this, "Add",
newEntry + "\n" + "Is this station known to be active on EME?",
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
if(ret==QMessageBox::Yes) {
newEntry += ",EME,,";
} else {
newEntry += ",,,";
}
QString call3File = m_appDir + "/CALL3.TXT";
QFile f1(call3File);
if(!f1.open(QIODevice::ReadOnly | QIODevice::Text)) {
msgBox("Cannot open " + call3File);
return;
}
QString tmpFile = m_appDir + "/CALL3.TMP";
QFile f2(tmpFile);
if(!f2.open(QIODevice::WriteOnly | QIODevice::Text)) {
msgBox("Cannot open " + tmpFile);
return;
}
QTextStream in(&f1);
QTextStream out(&f2);
QString hc=hiscall;
QString hc1="";
QString hc2="";
QString s;
do {
s=in.readLine();
hc1=hc2;
if(s.mid(0,2)=="//") {
out << s + "\n";
} else {
int i1=s.indexOf(",");
hc2=s.mid(0,i1);
if(hc>hc1 && hc<hc2) {
out << newEntry + "\n";
m_call3Modified=true;
} else if(hc==hc2) {
QString t=s + "\n\n is already in CALL3.TXT\n" +
"Do you wish to replace it?";
int ret = QMessageBox::warning(this, "Add",t,
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
if(ret==QMessageBox::Yes) {
out << newEntry + "\n";
m_call3Modified=true;
}
} else {
out << s + "\n";
}
}
} while(!s.isNull());
f1.close();
if(hc>hc1 && !m_call3Modified)
out << newEntry + "\n";
if(m_call3Modified) {
QFile f0(m_appDir + "/CALL3.OLD");
if(f0.exists()) f0.remove();
QFile f1(m_appDir + "/CALL3.TXT");
f1.rename(m_appDir + "/CALL3.OLD");
f2.rename(m_appDir + "/CALL3.TXT");
f2.close();
}
} }
void MainWindow::msgtype(QString t, QLineEdit* tx) //msgtype() void MainWindow::msgtype(QString t, QLineEdit* tx) //msgtype()
@ -1402,7 +1278,6 @@ void MainWindow::on_logQSOButton_clicked() //Log QSO button
QTextStream out(&f); QTextStream out(&f);
out << logEntry; out << logEntry;
f.close(); f.close();
m_worked[m_hisCall]=true;
} }
/* /*

View File

@ -68,7 +68,6 @@ private slots:
void on_actionDelete_all_wav_files_in_SaveDir_triggered(); void on_actionDelete_all_wav_files_in_SaveDir_triggered();
void on_actionFind_Delta_Phi_triggered(); void on_actionFind_Delta_Phi_triggered();
void on_actionF4_sets_Tx6_triggered(); void on_actionF4_sets_Tx6_triggered();
void on_actionOnly_EME_calls_triggered();
void on_actionNo_shorthands_if_Tx1_triggered(); void on_actionNo_shorthands_if_Tx1_triggered();
void on_actionNo_Deep_Search_triggered(); void on_actionNo_Deep_Search_triggered();
void on_actionNormal_Deep_Search_triggered(); void on_actionNormal_Deep_Search_triggered();
@ -129,32 +128,20 @@ private:
qint32 m_ntx; qint32 m_ntx;
qint32 m_pttPort; qint32 m_pttPort;
qint32 m_timeout; qint32 m_timeout;
qint32 m_dPhi;
qint32 m_fCal;
qint32 m_txFreq; qint32 m_txFreq;
qint32 m_setftx; qint32 m_setftx;
qint32 m_ndepth; qint32 m_ndepth;
qint32 m_sec0; qint32 m_sec0;
qint32 m_RxLog; qint32 m_RxLog;
qint32 m_nutc0; qint32 m_nutc0;
qint32 m_mode65;
qint32 m_nrx; qint32 m_nrx;
qint32 m_hsym0; qint32 m_hsym0;
qint32 m_paInDevice; qint32 m_paInDevice;
qint32 m_paOutDevice; qint32 m_paOutDevice;
qint32 m_udpPort;
qint32 m_NBslider; qint32 m_NBslider;
qint32 m_adjustIQ;
qint32 m_applyIQcal;
qint32 m_mult570;
qint32 m_TRperiod; qint32 m_TRperiod;
qint32 m_nsps; qint32 m_nsps;
double m_fAdd;
double m_IQamp;
double m_IQphase;
double m_cal570;
bool m_monitoring; bool m_monitoring;
bool m_transmitting; bool m_transmitting;
bool m_diskData; bool m_diskData;
@ -165,24 +152,12 @@ private:
bool m_txMute; bool m_txMute;
bool m_restart; bool m_restart;
bool m_killAll; bool m_killAll;
bool m_xpol;
bool m_xpolx;
bool m_call3Modified;
bool m_startAnother; bool m_startAnother;
bool m_saveAll; bool m_saveAll;
bool m_onlyEME;
bool m_widebandDecode; bool m_widebandDecode;
bool m_kb8rq; bool m_kb8rq;
bool m_NB; bool m_NB;
bool m_fs96000;
bool m_IQswap;
bool m_10db;
bool m_initIQplus;
float m_gainx;
float m_gainy;
float m_phasex;
float m_phasey;
float m_pctZap; float m_pctZap;
QRect m_wideGraphGeom; QRect m_wideGraphGeom;
@ -202,7 +177,6 @@ private:
QFutureWatcher<void>* watcher2; QFutureWatcher<void>* watcher2;
QProcess proc_m65; QProcess proc_m65;
QProcess proc_qthid;
QString m_path; QString m_path;
QString m_pbdecoding_style1; QString m_pbdecoding_style1;
@ -214,14 +188,10 @@ private:
QString m_hisGrid; QString m_hisGrid;
QString m_appDir; QString m_appDir;
QString m_saveDir; QString m_saveDir;
QString m_azelDir;
QString m_dxccPfx; QString m_dxccPfx;
QString m_palette; QString m_palette;
QString m_dateTime; QString m_dateTime;
QString m_mode; QString m_mode;
QString m_colors;
QHash<QString,bool> m_worked;
SoundInThread soundInThread; //Instantiate the audio threads SoundInThread soundInThread; //Instantiate the audio threads
SoundOutThread soundOutThread; SoundOutThread soundOutThread;
@ -239,8 +209,8 @@ private:
void stub(); void stub();
}; };
extern void getfile(QString fname, bool xpol, int idInt); extern void getfile(QString fname, int ntrperiod);
extern void savewav(QString fname); extern void savewav(QString fname, int ntrperiod);
extern int killbyname(const char* progName); extern int killbyname(const char* progName);
extern void getDev(int* numDevices,char hostAPI_DeviceName[][50], extern void getDev(int* numDevices,char hostAPI_DeviceName[][50],
int minChan[], int maxChan[], int minChan[], int maxChan[],

View File

@ -29,7 +29,7 @@
<string notr="true"/> <string notr="true"/>
</property> </property>
<widget class="QWidget" name="centralWidget"> <widget class="QWidget" name="centralWidget">
<widget class="QWidget" name=""> <widget class="QWidget" name="layoutWidget">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>10</x>
@ -1284,14 +1284,6 @@ p, li { white-space: pre-wrap; }
<string>F4 sets Tx6</string> <string>F4 sets Tx6</string>
</property> </property>
</action> </action>
<action name="actionOnly_EME_calls">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Only EME calls</string>
</property>
</action>
<action name="actionNo_shorthands_if_Tx1"> <action name="actionNo_shorthands_if_Tx1">
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>

View File

@ -78,7 +78,7 @@ void WideGraph::dataSink2(float s[], int nkhz, int ihsym, int ndiskdata,
int nbpp = ui->widePlot->binsPerPixel(); int nbpp = ui->widePlot->binsPerPixel();
static int n=0; static int n=0;
static int nkhz0=-999; static int nkhz0=-999;
static int ntrz=0; static int ntr0=0;
df = 12000.0/m_nsps; df = 12000.0/m_nsps;
if(nkhz != nkhz0) { if(nkhz != nkhz0) {
@ -126,7 +126,7 @@ void WideGraph::dataSink2(float s[], int nkhz, int ihsym, int ndiskdata,
qint64 ms = QDateTime::currentMSecsSinceEpoch() % 86400000; qint64 ms = QDateTime::currentMSecsSinceEpoch() % 86400000;
int ntr = (ms/1000) % m_TRperiod; int ntr = (ms/1000) % m_TRperiod;
if((ndiskdata && ihsym <= m_waterfallAvg) || (!ndiskdata && ntr<ntrz)) { if((ndiskdata && ihsym <= m_waterfallAvg) || (!ndiskdata && ntr<ntr0)) {
for (int i=0; i<2048; i++) { for (int i=0; i<2048; i++) {
swide[i] = 1.e30; swide[i] = 1.e30;
} }
@ -134,7 +134,7 @@ void WideGraph::dataSink2(float s[], int nkhz, int ihsym, int ndiskdata,
splot[i] = 1.e30; splot[i] = 1.e30;
} }
} }
ntrz=ntr; ntr0=ntr;
ui->widePlot->draw(swide,i0,splot); ui->widePlot->draw(swide,i0,splot);
} }
} }