From d0ea4613552198fc19fefde2eb4475795b8fed41 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Sun, 11 Dec 2022 08:35:28 -0500 Subject: [PATCH] Remove most references to ".tf2". --- q65w/commons.h | 4 ++-- q65w/getfile.cpp | 4 +--- q65w/mainwindow.cpp | 7 ++----- q65w/mainwindow.h | 2 +- q65w/mainwindow.ui | 6 +++--- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/q65w/commons.h b/q65w/commons.h index a76bc1dd4..4f2b0dbda 100644 --- a/q65w/commons.h +++ b/q65w/commons.h @@ -16,7 +16,7 @@ extern struct { //This is "common/datcom/..." in Fortran int mousefqso; //User-selected QSO freq (kHz) int nagain; //1 ==> decode only at fQSO +/- Tol int ndepth; //How much hinted decoding to do? - int ndiskdat; //1 ==> data read from *.tf2 or *.iq file + int ndiskdat; //1 ==> data read from *.iq file int neme; //Hinted decoding tries only for EME calls int newdat; //1 ==> new data, must do long FFT int nfa; //Low decode limit (kHz) @@ -55,7 +55,7 @@ extern struct { //This is "common/datcom/..." in Fortran int mousefqso; //User-selected QSO freq (kHz) int nagain; //1 ==> decode only at fQSO +/- Tol int ndepth; //How much hinted decoding to do? - int ndiskdat; //1 ==> data read from *.tf2 or *.iq file + int ndiskdat; //1 ==> data read from *.iq file int neme; //Hinted decoding tries only for EME calls int newdat; //1 ==> new data, must do long FFT int nfa; //Low decode limit (kHz) diff --git a/q65w/getfile.cpp b/q65w/getfile.cpp index b74ba240c..01b17469d 100644 --- a/q65w/getfile.cpp +++ b/q65w/getfile.cpp @@ -44,7 +44,7 @@ void getfile(QString fname, bool xpol, int dbDgrd) datcom_.ndiskdat=1; int nfreq=(int)datcom_.fcenter; - if(nfreq!=144 and nfreq != 432 and nfreq != 1296) datcom_.fcenter=144.125; + if(nfreq!=144 and nfreq != 432 and nfreq != 1296) datcom_.fcenter=1296.080; int i0=fname.indexOf(".tf2"); if(i0<0) i0=fname.indexOf(".iq"); datcom_.nutc=0; @@ -78,8 +78,6 @@ void savetf2(QString fname, bool xpol) free(buf); } -//#define MAX_RANDOM 0x7fffffff - /* Generate gaussian random float with mean=0 and std_dev=1 */ float gran() { diff --git a/q65w/mainwindow.cpp b/q65w/mainwindow.cpp index fdd0b0bad..edb645e55 100644 --- a/q65w/mainwindow.cpp +++ b/q65w/mainwindow.cpp @@ -743,13 +743,12 @@ void MainWindow::decoderFinished() //diskWriteFinished lab5->setText(t1); } -//Delete ../save/*.tf2 -void MainWindow::on_actionDelete_all_tf2_files_in_SaveDir_triggered() +void MainWindow::on_actionDelete_all_iq_files_in_SaveDir_triggered() { int i; QString fname; int ret = QMessageBox::warning(this, "Confirm Delete", - "Are you sure you want to delete all *.tf2 and *.iq files in\n" + + "Are you sure you want to delete all *.iq files in\n" + QDir::toNativeSeparators(m_saveDir) + " ?", QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes); if(ret==QMessageBox::Yes) { @@ -758,8 +757,6 @@ void MainWindow::on_actionDelete_all_tf2_files_in_SaveDir_triggered() QList::iterator f; for(f=files.begin(); f!=files.end(); ++f) { fname=*f; - i=(fname.indexOf(".tf2")); - if(i==11) dir.remove(fname); i=(fname.indexOf(".iq")); if(i==11) dir.remove(fname); } diff --git a/q65w/mainwindow.h b/q65w/mainwindow.h index d67fc579d..3cd57bf9c 100644 --- a/q65w/mainwindow.h +++ b/q65w/mainwindow.h @@ -63,7 +63,7 @@ private slots: void on_actionOpen_triggered(); void on_actionOpen_next_in_directory_triggered(); void on_actionDecode_remaining_files_in_directory_triggered(); - void on_actionDelete_all_tf2_files_in_SaveDir_triggered(); + void on_actionDelete_all_iq_files_in_SaveDir_triggered(); void on_actionNo_Deep_Search_triggered(); void on_actionNormal_Deep_Search_triggered(); void on_actionAggressive_Deep_Search_triggered(); diff --git a/q65w/mainwindow.ui b/q65w/mainwindow.ui index 1c9b5d9ed..acce2af65 100644 --- a/q65w/mainwindow.ui +++ b/q65w/mainwindow.ui @@ -627,7 +627,7 @@ p, li { white-space: pre-wrap; } - + @@ -757,9 +757,9 @@ p, li { white-space: pre-wrap; } Shift+F6 - + - Delete all *.tf2 and *.iq files in SaveDir + Delete all *.iq files in SaveDir