From e72b39a9d9c3da980dad862c605723fd91fa8c76 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Tue, 24 Jan 2023 14:43:29 -0500
Subject: [PATCH] More code cleanup.
---
q65w/getfile.cpp | 2 +-
q65w/mainwindow.cpp | 5 +----
q65w/soundin.cpp | 1 +
q65w/widegraph.h | 4 ----
4 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/q65w/getfile.cpp b/q65w/getfile.cpp
index f06d7c03d..c43fa8397 100644
--- a/q65w/getfile.cpp
+++ b/q65w/getfile.cpp
@@ -23,10 +23,10 @@ void getfile(QString fname, bool xpol, int dbDgrd)
if(fp != NULL) {
auto n = fread(&datcom_.fcenter,sizeof(datcom_.fcenter),1,fp);
+// qDebug() << "aa0" << sizeof(datcom_.fcenter) << n << datcom_.fcenter;
n = fread(id,2,npts,fp);
Q_UNUSED (n);
int j=0;
-// qDebug() << "aaa" << datcom_.fcenter;
if(dbDgrd<0) {
for(int i=0; i<npts; i+=2) {
diff --git a/q65w/mainwindow.cpp b/q65w/mainwindow.cpp
index c0e28fef9..1777f7a42 100644
--- a/q65w/mainwindow.cpp
+++ b/q65w/mainwindow.cpp
@@ -701,14 +701,11 @@ void MainWindow::on_actionDecode_remaining_files_in_directory_triggered()
void MainWindow::diskDat() //diskDat()
{
+// qDebug() << "aa1" << datcom_.fcenter;
double hsym;
//These may be redundant??
m_diskData=true;
datcom_.newdat=1;
- if(m_wide_graph_window->m_bForceCenterFreq) {
- datcom_.fcenter=m_wide_graph_window->m_dForceCenterFreq;
- }
-
hsym=2048.0*96000.0/11025.0; //Samples per JT65 half-symbol
for(int i=0; i<304; i++) { // Do the half-symbol FFTs
int k = i*hsym + 2048.5;
diff --git a/q65w/soundin.cpp b/q65w/soundin.cpp
index d6ba6e56a..2c194a809 100644
--- a/q65w/soundin.cpp
+++ b/q65w/soundin.cpp
@@ -211,6 +211,7 @@ void SoundInThread::inputUDP()
int nsam=-1;
recvpkt_(&nsam, &b.iblk, &b.nrx, &k, b.d8, b.d8);
datcom_.fcenter=b.cfreq + m_fAdd;
+// qDebug() << "aaa" << b.cfreq << m_fAdd << datcom_.fcenter;
}
m_hsym=(k-2048)*11025.0/(2048.0*m_rate);
diff --git a/q65w/widegraph.h b/q65w/widegraph.h
index 67614eeb0..e678a6646 100644
--- a/q65w/widegraph.h
+++ b/q65w/widegraph.h
@@ -59,12 +59,8 @@ private slots:
private:
Ui::WideGraph * ui;
QString m_settings_filename;
-public:
- bool m_bForceCenterFreq;
-private:
bool m_bLockTxRx;
public:
- double m_dForceCenterFreq;
double m_TxOffset;
private:
qint32 m_waterfallAvg;