More cleanup.

This commit is contained in:
Joe Taylor 2022-12-05 19:44:48 -05:00
parent c1972fc2dd
commit defb89573f

View File

@ -70,12 +70,9 @@ MainWindow::MainWindow(QWidget *parent) :
setWindowTitle (program_title ()); setWindowTitle (program_title ());
connect(&soundInThread, SIGNAL(readyForFFT(int)), connect(&soundInThread, SIGNAL(readyForFFT(int)), this, SLOT(dataSink(int)));
this, SLOT(dataSink(int))); connect(&soundInThread, SIGNAL(error(QString)), this, SLOT(showSoundInError(QString)));
connect(&soundInThread, SIGNAL(error(QString)), this, connect(&soundInThread, SIGNAL(status(QString)), this, SLOT(showStatusMessage(QString)));
SLOT(showSoundInError(QString)));
connect(&soundInThread, SIGNAL(status(QString)), this,
SLOT(showStatusMessage(QString)));
createStatusBar(); createStatusBar();
connect(&proc_m65, SIGNAL(readyReadStandardOutput()), this, SLOT(readFromStdout())); connect(&proc_m65, SIGNAL(readyReadStandardOutput()), this, SLOT(readFromStdout()));
@ -130,8 +127,7 @@ MainWindow::MainWindow(QWidget *parent) :
while(true) { while(true) {
int iret=killbyname("m65.exe"); int iret=killbyname("m65.exe");
if(iret == 603) break; if(iret == 603) break;
if(iret != 0) msgBox("KillByName return code: " + if(iret != 0) msgBox("KillByName return code: " + QString::number(iret));
QString::number(iret));
} }
#endif #endif
@ -946,8 +942,6 @@ void MainWindow::decode() //decode()
{ {
ui->DecodeButton->setStyleSheet(m_pbdecoding_style1); ui->DecodeButton->setStyleSheet(m_pbdecoding_style1);
// QFile f("mockRTfiles.txt");
// if(datcom_.nagain==0 && (!m_diskData) && !f.exists()) {
if(datcom_.nagain==0 && (!m_diskData)) { if(datcom_.nagain==0 && (!m_diskData)) {
qint64 ms = QDateTime::currentMSecsSinceEpoch() % 86400000; qint64 ms = QDateTime::currentMSecsSinceEpoch() % 86400000;
int imin=ms/60000; int imin=ms/60000;
@ -963,8 +957,7 @@ void MainWindow::decode() //decode()
datcom_.ndiskdat=0; datcom_.ndiskdat=0;
if(m_diskData) { if(m_diskData) {
datcom_.ndiskdat=1; datcom_.ndiskdat=1;
int i0=m_path.indexOf(".tf2"); int i0=m_path.indexOf(".iq");
if(i0<0) i0=m_path.indexOf(".iq");
if(i0>0) { if(i0>0) {
// Compute self Doppler using the filename for Date and Time // Compute self Doppler using the filename for Date and Time
int nyear=m_path.mid(i0-11,2).toInt()+2000; int nyear=m_path.mid(i0-11,2).toInt()+2000;
@ -975,7 +968,6 @@ void MainWindow::decode() //decode()
double uth=nhr + nmin/60.0; double uth=nhr + nmin/60.0;
int nfreq=(int)datcom_.fcenter; int nfreq=(int)datcom_.fcenter;
int ndop00; int ndop00;
astrosub00_(&nyear, &month, &nday, &uth, &nfreq, m_myGrid.toLatin1(),&ndop00,6); astrosub00_(&nyear, &month, &nday, &uth, &nfreq, m_myGrid.toLatin1(),&ndop00,6);
datcom_.nfast=ndop00; //Send self Doppler to decoder, via datcom datcom_.nfast=ndop00; //Send self Doppler to decoder, via datcom
} }